[NTDDK]

- Group related definitions.
[XDK]
- Add PCI_CAPABILITIES_HEADER.
[WDM]
- Update wdm.h to reflect XDK changes.

svn path=/branches/header-work/; revision=46260

diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h
index a5fbd8e..a537182 100644 (file)
--- a/include/ddk/ntddk.h
+++ b/include/ddk/ntddk.h
@@ -5533,6 +5533,12 @@ KeGetCurrentProcessorNumber(VOID)
     return (ULONG)__readfsbyte(FIELD_OFFSET(KPCR, Number));
 }
 
+typedef enum _INTERLOCKED_RESULT {
+  ResultNegative = RESULT_NEGATIVE,
+  ResultZero = RESULT_ZERO,
+  ResultPositive = RESULT_POSITIVE
+} INTERLOCKED_RESULT;
+
 NTKERNELAPI
 INTERLOCKED_RESULT
 FASTCALL
@@ -5638,12 +5644,6 @@ KeGetCurrentProcessorNumber(VOID)
 
 #endif /* _AMD64_ */
 
-typedef enum _INTERLOCKED_RESULT {
-  ResultNegative = RESULT_NEGATIVE,
-  ResultZero = RESULT_ZERO,
-  ResultPositive = RESULT_POSITIVE
-} INTERLOCKED_RESULT;
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index b98dc0e..4e58b4a 100644 (file)
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -3089,6 +3089,11 @@ typedef struct _SHARE_ACCESS {
     } type2; \
   } u;
 
+typedef struct _PCI_CAPABILITIES_HEADER {
+  UCHAR CapabilityID;
+  UCHAR Next;
+} PCI_CAPABILITIES_HEADER, *PPCI_CAPABILITIES_HEADER;
+
 typedef struct _PCI_COMMON_HEADER {
   PCI_COMMON_HEADER_LAYOUT
 } PCI_COMMON_HEADER, *PPCI_COMMON_HEADER;

diff --git a/include/xdk/iotypes.h b/include/xdk/iotypes.h
index 31ed5e0..a2bce0b 100644 (file)
--- a/include/xdk/iotypes.h
+++ b/include/xdk/iotypes.h
@@ -478,6 +478,11 @@ typedef struct _SHARE_ACCESS {
     } type2; \
   } u;
 
+typedef struct _PCI_CAPABILITIES_HEADER {
+  UCHAR CapabilityID;
+  UCHAR Next;
+} PCI_CAPABILITIES_HEADER, *PPCI_CAPABILITIES_HEADER;
+
 typedef struct _PCI_COMMON_HEADER {
   PCI_COMMON_HEADER_LAYOUT
 } PCI_COMMON_HEADER, *PPCI_COMMON_HEADER;