[PCIIDEX]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve the GUIDs situation.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61949

diff --git a/reactos/drivers/storage/ide/pciidex/fdo.c b/reactos/drivers/storage/ide/pciidex/fdo.c
index 497842f..0d6cb3b 100644 (file)
--- a/reactos/drivers/storage/ide/pciidex/fdo.c
+++ b/reactos/drivers/storage/ide/pciidex/fdo.c
@@ -11,6 +11,9 @@
 #define NDEBUG
 #include <debug.h>
 
+#include <initguid.h>
+#include <wdmguid.h>
+
 static NTSTATUS
 GetBusInterface(
        IN PFDO_DEVICE_EXTENSION DeviceExtension)

diff --git a/reactos/drivers/storage/ide/pciidex/miniport.c b/reactos/drivers/storage/ide/pciidex/miniport.c
index 1eed359..d26300f 100644 (file)
--- a/reactos/drivers/storage/ide/pciidex/miniport.c
+++ b/reactos/drivers/storage/ide/pciidex/miniport.c
@@ -6,7 +6,6 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define INITGUID
 #include "pciidex.h"
 
 #define NDEBUG

diff --git a/reactos/drivers/storage/ide/pciidex/pciidex.h b/reactos/drivers/storage/ide/pciidex/pciidex.h
index f2c2836..88db458 100644 (file)
--- a/reactos/drivers/storage/ide/pciidex/pciidex.h
+++ b/reactos/drivers/storage/ide/pciidex/pciidex.h
@@ -1,8 +1,5 @@
 #include <ntifs.h>
-#include <ntddk.h>
 #include <ide.h>
-#include <wdmguid.h>
-#include <stdio.h>
 
 typedef struct _PCIIDEX_DRIVER_EXTENSION
 {

diff --git a/reactos/drivers/storage/ide/pciidex/pdo.c b/reactos/drivers/storage/ide/pciidex/pdo.c
index f79b00a..af41e5f 100644 (file)
--- a/reactos/drivers/storage/ide/pciidex/pdo.c
+++ b/reactos/drivers/storage/ide/pciidex/pdo.c
@@ -8,6 +8,8 @@
 
 #include "pciidex.h"
 
+#include <stdio.h>
+
 #define NDEBUG
 #include <debug.h>