[PCI]

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

svn path=/trunk/; revision=61523

diff --git a/reactos/drivers/bus/pci/fdo.c b/reactos/drivers/bus/pci/fdo.c
index 03bc36b..b49fc7b 100644 (file)
--- a/reactos/drivers/bus/pci/fdo.c
+++ b/reactos/drivers/bus/pci/fdo.c
@@ -9,9 +9,7 @@
 
 #include "pci.h"
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 /*** PRIVATE *****************************************************************/

diff --git a/reactos/drivers/bus/pci/pci.c b/reactos/drivers/bus/pci/pci.c
index 6d28f01..4933b59 100644 (file)
--- a/reactos/drivers/bus/pci/pci.c
+++ b/reactos/drivers/bus/pci/pci.c
@@ -7,12 +7,11 @@
  *      10-09-2001  CSH  Created
  */
 
-#define INITGUID
 #include "pci.h"
 
-#ifndef NDEBUG
+#include <stdio.h>
+
 #define NDEBUG
-#endif
 #include <debug.h>
 
 static DRIVER_DISPATCH PciDispatchDeviceControl;

diff --git a/reactos/drivers/bus/pci/pci.h b/reactos/drivers/bus/pci/pci.h
index 1cfc32c..5ae4728 100644 (file)
--- a/reactos/drivers/bus/pci/pci.h
+++ b/reactos/drivers/bus/pci/pci.h
@@ -1,7 +1,4 @@
 #include <ntifs.h>
-#include <wdmguid.h>
-#include <stdio.h>
-#include <ntddk.h>
 
 #define TAG_PCI '0ICP'
 

diff --git a/reactos/drivers/bus/pci/pdo.c b/reactos/drivers/bus/pci/pdo.c
index 1263e3c..08306f0 100644 (file)
--- a/reactos/drivers/bus/pci/pdo.c
+++ b/reactos/drivers/bus/pci/pdo.c
@@ -9,9 +9,10 @@
 
 #include "pci.h"
 
-#ifndef NDEBUG
+#include <initguid.h>
+#include <wdmguid.h>
+
 #define NDEBUG
-#endif
 #include <debug.h>
 
 /*** PRIVATE *****************************************************************/