[ros-diffs] [tkreuzer] 35969: Fix and update CM_PARTIAL_RESOURCE_DESCRIPTOR

Author: tkreuzer
Date: Fri Sep  5 18:35:40 2008
New Revision: 35969

URL: http://svn.reactos.org/svn/reactos?rev=35969&view=rev
Log:
Fix and update CM_PARTIAL_RESOURCE_DESCRIPTOR

Modified:
    branches/ros-amd64-bringup/reactos/include/ddk/winddk.h
    branches/ros-amd64-bringup/reactos/include/ndk/cmtypes.h

Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Fri Sep  5
18:35:40 2008
@@ -1759,8 +1759,25 @@
     struct {
       ULONG Level;
       ULONG Vector;
-      ULONG Affinity;
+      KAFFINITY Affinity;
     } Interrupt;
+#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+    struct {
+      union {
+        struct {
+          USHORT Reserved;
+          USHORT MessageCount;
+          ULONG Vector;
+          KAFFINITY Affinity;
+        } Raw;
+        struct {
+          ULONG Level;
+          ULONG Vector;
+          KAFFINITY Affinity;
+        } Translated;
+      };
+    } MessageInterrupt;
+#endif
     struct {
       PHYSICAL_ADDRESS Start;
       ULONG Length;
@@ -1783,6 +1800,20 @@
       ULONG Reserved1;
       ULONG Reserved2;
     } DeviceSpecificData;
+#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+    struct {
+      PHYSICAL_ADDRESS Start;
+      ULONG Length40;
+    } Memory40;
+    struct {
+      PHYSICAL_ADDRESS Start;
+      ULONG Length48;
+    } Memory48;
+    struct {
+      PHYSICAL_ADDRESS Start;
+      ULONG Length64;
+    } Memory64;
+#endif
   } u;
 } CM_PARTIAL_RESOURCE_DESCRIPTOR, *PCM_PARTIAL_RESOURCE_DESCRIPTOR;
 

Modified: branches/ros-amd64-bringup/reactos/include/ndk/cmtypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ndk/cmtypes.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ndk/cmtypes.h [iso-8859-1] Fri Sep  5
18:35:40 2008
@@ -433,8 +433,29 @@
         {
             ULONG Level;
             ULONG Vector;
-            ULONG Affinity;
+            KAFFINITY Affinity;
         } Interrupt;
+#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+        struct
+        {
+            union
+            {
+                struct
+                {
+                    USHORT Reserved;
+                    USHORT MessageCount;
+                    ULONG Vector;
+                    KAFFINITY Affinity;
+                } Raw;
+                struct
+                {
+                    ULONG Level;
+                    ULONG Vector;
+                    KAFFINITY Affinity;
+                } Translated;
+            };
+        } MessageInterrupt;
+#endif
         struct
         {
             PHYSICAL_ADDRESS Start;
@@ -448,7 +469,7 @@
         } Dma;
         struct
         {
-          ULONG Data[3];
+            ULONG Data[3];
         } DevicePrivate;
         struct
         {
@@ -462,6 +483,23 @@
             ULONG Reserved1;
             ULONG Reserved2;
         } DeviceSpecificData;
+#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+        struct
+        {
+            PHYSICAL_ADDRESS Start;
+            ULONG Length40;
+        } Memory40;
+        struct
+        {
+            PHYSICAL_ADDRESS Start;
+            ULONG Length48;
+        } Memory48;
+        struct
+        {
+            PHYSICAL_ADDRESS Start;
+            ULONG Length64;
+        } Memory64;
+#endif
     } u;
 } CM_PARTIAL_RESOURCE_DESCRIPTOR, *PCM_PARTIAL_RESOURCE_DESCRIPTOR;