From adfb80dce09d24db7f78ffbbac9b2372e84407e7 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 10 Mar 2010 23:49:42 +0000
Subject: [PATCH] [NTDDK] - Move several ntddk.h related definition from
 winddk.h - Group related definitions

svn path=/branches/header-work/; revision=46086
---
 include/ddk/ntddk.h  | 41 ++++++++++++++++++++++++++++++++++++++++-
 include/ddk/winddk.h | 42 ------------------------------------------
 2 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h
index 401902d93b5..693d5666264 100644
--- a/include/ddk/ntddk.h
+++ b/include/ddk/ntddk.h
@@ -449,7 +449,46 @@ FsRtlIsTotalDeviceFailure(
   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)
 
diff --git a/include/ddk/winddk.h b/include/ddk/winddk.h
index 4e371c18517..a5fab016f3e 100644
--- a/include/ddk/winddk.h
+++ b/include/ddk/winddk.h
@@ -1807,48 +1807,6 @@ KeGetCurrentProcessorNumber(VOID)
 #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_)