[PCIX]

* 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=61524
2024-12-28 18:15:11 +00:00 · 2014-01-04 12:05:02 +00:00 · 2014-01-04 12:05:02 +00:00 · d4fa979434
commit d4fa979434
parent cc7bc9bd07
35 changed files with 44 additions and 34 deletions
--- a/reactos/drivers/bus/pcix/arb/ar_busno.c
+++ b/reactos/drivers/bus/pcix/arb/ar_busno.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/arb/ar_memio.c
+++ b/reactos/drivers/bus/pcix/arb/ar_memio.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/arb/arb_comn.c
+++ b/reactos/drivers/bus/pcix/arb/arb_comn.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/arb/tr_irq.c
+++ b/reactos/drivers/bus/pcix/arb/tr_irq.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/debug.c
+++ b/reactos/drivers/bus/pcix/debug.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/device.c
+++ b/reactos/drivers/bus/pcix/device.c
@ -9,11 +9,10 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/

 VOID
--- a/reactos/drivers/bus/pcix/dispatch.c
+++ b/reactos/drivers/bus/pcix/dispatch.c
@ -9,11 +9,10 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/

 IO_COMPLETION_ROUTINE PciSetEventCompletion;
--- a/reactos/drivers/bus/pcix/enum.c
+++ b/reactos/drivers/bus/pcix/enum.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/fdo.c
+++ b/reactos/drivers/bus/pcix/fdo.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/guid.c
+++ b/reactos/drivers/bus/pcix/guid.c
@ -1,19 +1,7 @@
-/*
- * PROJECT:         ReactOS PCI Bus Driver
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            drivers/bus/pci/guid.c
- * PURPOSE:         GUID Data
- * PROGRAMMERS:     ReactOS Portable Systems Group
- */
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */

-/* INCLUDES *******************************************************************/
+#include <initguid.h>
+#include <ntddk.h>
+#include <wdmguid.h>

-#include <pci.h>
-#define NDEBUG
-#include <debug.h>
-
-/* GLOBALS ********************************************************************/
-
-/* FUNCTIONS ******************************************************************/
-
-/* EOF */
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
--- a/reactos/drivers/bus/pcix/hookhal.c
+++ b/reactos/drivers/bus/pcix/hookhal.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/init.c
+++ b/reactos/drivers/bus/pcix/init.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/intrface/agpintrf.c
+++ b/reactos/drivers/bus/pcix/intrface/agpintrf.c
@ -9,6 +9,9 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
+#include <ntagp.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/intrface/busintrf.c
+++ b/reactos/drivers/bus/pcix/intrface/busintrf.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/intrface/cardbus.c
+++ b/reactos/drivers/bus/pcix/intrface/cardbus.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/intrface/devhere.c
+++ b/reactos/drivers/bus/pcix/intrface/devhere.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/intrface/ideintrf.c
+++ b/reactos/drivers/bus/pcix/intrface/ideintrf.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/intrface/intrface.c
+++ b/reactos/drivers/bus/pcix/intrface/intrface.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/intrface/lddintrf.c
+++ b/reactos/drivers/bus/pcix/intrface/lddintrf.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/intrface/locintrf.c
+++ b/reactos/drivers/bus/pcix/intrface/locintrf.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/intrface/pmeintf.c
+++ b/reactos/drivers/bus/pcix/intrface/pmeintf.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/intrface/routintf.c
+++ b/reactos/drivers/bus/pcix/intrface/routintf.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/pci.h
+++ b/reactos/drivers/bus/pcix/pci.h
@ -6,18 +6,15 @@
 * PROGRAMMERS:     ReactOS Portable Systems Group
 */

-#include <initguid.h>
 #include <ntifs.h>
-#include <ntagp.h>
 #include <wdmguid.h>
 #include <wchar.h>
 #include <acpiioct.h>
 #include <drivers/pci/pci.h>
 #include <drivers/acpi/acpi.h>
-#include "halfuncs.h"
-#include "rtlfuncs.h"
-#include "vffuncs.h"
-#include "bugcodes.h"
+#include <ndk/halfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/vffuncs.h>

 //
 // Tag used in all pool allocations (Pci Bus)
--- a/reactos/drivers/bus/pcix/pci/busno.c
+++ b/reactos/drivers/bus/pcix/pci/busno.c
@ -9,11 +9,10 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/

 BOOLEAN
--- a/reactos/drivers/bus/pcix/pci/config.c
+++ b/reactos/drivers/bus/pcix/pci/config.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/pci/devhere.c
+++ b/reactos/drivers/bus/pcix/pci/devhere.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/pci/id.c
+++ b/reactos/drivers/bus/pcix/pci/id.c
@ -9,11 +9,10 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+#include <stdio.h>
+
 #define NDEBUG
 #include <debug.h>
-#include "stdio.h"
-
-/* GLOBALS ********************************************************************/

 /* FUNCTIONS ******************************************************************/

--- a/reactos/drivers/bus/pcix/pci/ppbridge.c
+++ b/reactos/drivers/bus/pcix/pci/ppbridge.c
@ -9,11 +9,10 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

-/* GLOBALS ********************************************************************/
-
 /* FUNCTIONS ******************************************************************/

 ULONG
--- a/reactos/drivers/bus/pcix/pci/romimage.c
+++ b/reactos/drivers/bus/pcix/pci/romimage.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/pci/state.c
+++ b/reactos/drivers/bus/pcix/pci/state.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/pcivrify.c
+++ b/reactos/drivers/bus/pcix/pcivrify.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/pdo.c
+++ b/reactos/drivers/bus/pcix/pdo.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/power.c
+++ b/reactos/drivers/bus/pcix/power.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/usage.c
+++ b/reactos/drivers/bus/pcix/usage.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>

--- a/reactos/drivers/bus/pcix/utils.c
+++ b/reactos/drivers/bus/pcix/utils.c
@ -9,6 +9,7 @@
 /* INCLUDES *******************************************************************/

 #include <pci.h>
+
 #define NDEBUG
 #include <debug.h>