[ros-diffs] [akhaldi] 46086: [NTDDK] - Move several ntddk.h related definition from winddk.h - Group related definitions

Author: akhaldi
Date: Thu Mar 11 00:49:42 2010
New Revision: 46086

URL: http://svn.reactos.org/svn/reactos?rev=46086&view=rev
Log:
[NTDDK]
- Move several ntddk.h related definition from winddk.h
- Group related definitions

Modified:
    branches/header-work/include/ddk/ntddk.h
    branches/header-work/include/ddk/winddk.h

Modified: branches/header-work/include/ddk/ntddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h…
==============================================================================
--- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Thu Mar 11 00:49:42 2010
@@ -449,7 +449,46 @@
   IN NTSTATUS Status);
 #endif
 
-/* Hardware abstraction layer routines */
+/* Hardware Abstraction Layer Types */
+
+typedef VOID
+(NTAPI *PciPin2Line)(
+  IN struct _BUS_HANDLER *BusHandler,
+  IN struct _BUS_HANDLER *RootHandler,
+  IN PCI_SLOT_NUMBER SlotNumber,
+  IN PPCI_COMMON_CONFIG PciData);
+
+typedef VOID
+(NTAPI *PciLine2Pin)(
+  IN struct _BUS_HANDLER *BusHandler,
+  IN struct _BUS_HANDLER *RootHandler,
+  IN PCI_SLOT_NUMBER SlotNumber,
+  IN PPCI_COMMON_CONFIG PciNewData,
+  IN PPCI_COMMON_CONFIG PciOldData);
+
+typedef VOID
+(NTAPI *PciReadWriteConfig)(
+  IN struct _BUS_HANDLER *BusHandler,
+  IN PCI_SLOT_NUMBER Slot,
+  IN PVOID Buffer,
+  IN ULONG Offset,
+  IN ULONG Length);
+
+#define PCI_DATA_TAG ' ICP'
+#define PCI_DATA_VERSION 1
+
+typedef struct _PCIBUSDATA {
+  ULONG Tag;
+  ULONG Version;
+  PciReadWriteConfig ReadConfig;
+  PciReadWriteConfig WriteConfig;
+  PciPin2Line Pin2Line;
+  PciLine2Pin Line2Pin;
+  PCI_SLOT_NUMBER ParentSlot;
+  PVOID Reserved[4];
+} PCIBUSDATA, *PPCIBUSDATA;
+
+/* Hardware Abstraction Layer Functions */
 
 #if !defined(NO_LEGACY_DRIVERS)
 

Modified: branches/header-work/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.…
==============================================================================
--- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Thu Mar 11 00:49:42 2010
@@ -1807,48 +1807,6 @@
 #error Unknown architecture
 #endif
 
-typedef VOID
-(NTAPI *PciPin2Line)(
-    IN struct _BUS_HANDLER *BusHandler,
-    IN struct _BUS_HANDLER *RootHandler,
-    IN PCI_SLOT_NUMBER SlotNumber,
-    IN PPCI_COMMON_CONFIG PciData
-);
-
-typedef VOID
-(NTAPI *PciLine2Pin)(
-    IN struct _BUS_HANDLER *BusHandler,
-    IN struct _BUS_HANDLER *RootHandler,
-    IN PCI_SLOT_NUMBER SlotNumber,
-    IN PPCI_COMMON_CONFIG PciNewData,
-    IN PPCI_COMMON_CONFIG PciOldData
-);
-
-typedef VOID
-(NTAPI *PciReadWriteConfig)(
-    IN struct _BUS_HANDLER *BusHandler,
-    IN PCI_SLOT_NUMBER Slot,
-    IN PVOID Buffer,
-    IN ULONG Offset,
-    IN ULONG Length
-);
-
-#define PCI_DATA_TAG ' ICP'
-#define PCI_DATA_VERSION 1
-
-typedef struct _PCIBUSDATA
-{
-    ULONG Tag;
-    ULONG Version;
-    PciReadWriteConfig ReadConfig;
-    PciReadWriteConfig WriteConfig;
-    PciPin2Line Pin2Line;
-    PciLine2Pin Line2Pin;
-    PCI_SLOT_NUMBER ParentSlot;
-    PVOID Reserved[4];
-} PCIBUSDATA, *PPCIBUSDATA;
-
-
 /** SPINLOCK FUNCTIONS ********************************************************/
 
 #if defined (_X86_)