Author: akhaldi Date: Sat Jan 4 12:05:02 2014 New Revision: 61524
URL: http://svn.reactos.org/svn/reactos?rev=61524&view=rev Log: [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
Modified: trunk/reactos/drivers/bus/pcix/arb/ar_busno.c trunk/reactos/drivers/bus/pcix/arb/ar_memio.c trunk/reactos/drivers/bus/pcix/arb/arb_comn.c trunk/reactos/drivers/bus/pcix/arb/tr_irq.c trunk/reactos/drivers/bus/pcix/debug.c trunk/reactos/drivers/bus/pcix/device.c trunk/reactos/drivers/bus/pcix/dispatch.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/guid.c trunk/reactos/drivers/bus/pcix/hookhal.c trunk/reactos/drivers/bus/pcix/init.c trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c trunk/reactos/drivers/bus/pcix/intrface/busintrf.c trunk/reactos/drivers/bus/pcix/intrface/cardbus.c trunk/reactos/drivers/bus/pcix/intrface/devhere.c trunk/reactos/drivers/bus/pcix/intrface/ideintrf.c trunk/reactos/drivers/bus/pcix/intrface/intrface.c trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c trunk/reactos/drivers/bus/pcix/intrface/locintrf.c trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c trunk/reactos/drivers/bus/pcix/intrface/routintf.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/pci/busno.c trunk/reactos/drivers/bus/pcix/pci/config.c trunk/reactos/drivers/bus/pcix/pci/devhere.c trunk/reactos/drivers/bus/pcix/pci/id.c trunk/reactos/drivers/bus/pcix/pci/ppbridge.c trunk/reactos/drivers/bus/pcix/pci/romimage.c trunk/reactos/drivers/bus/pcix/pci/state.c trunk/reactos/drivers/bus/pcix/pcivrify.c trunk/reactos/drivers/bus/pcix/pdo.c trunk/reactos/drivers/bus/pcix/power.c trunk/reactos/drivers/bus/pcix/usage.c trunk/reactos/drivers/bus/pcix/utils.c
Modified: trunk/reactos/drivers/bus/pcix/arb/ar_busno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/ar_bus... ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/ar_busno.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/ar_busno.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/arb/ar_memio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/ar_mem... ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/ar_memio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/ar_memio.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/arb/arb_comn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/arb_co... ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/arb/tr_irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/tr_irq... ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/tr_irq.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/tr_irq.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/debug.c?re... ============================================================================== --- trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/device.c?r... ============================================================================== --- trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/device.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,10 +9,9 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h> - -/* GLOBALS ********************************************************************/
/* FUNCTIONS ******************************************************************/
Modified: trunk/reactos/drivers/bus/pcix/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/dispatch.c... ============================================================================== --- trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,10 +9,9 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h> - -/* GLOBALS ********************************************************************/
/* FUNCTIONS ******************************************************************/
Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?rev... ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev=... ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/guid.c?rev... ============================================================================== --- trunk/reactos/drivers/bus/pcix/guid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/guid.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -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 */
Modified: trunk/reactos/drivers/bus/pcix/hookhal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/hookhal.c?... ============================================================================== --- trunk/reactos/drivers/bus/pcix/hookhal.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/hookhal.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/init.c?rev... ============================================================================== --- trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/a... ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + +#include <ntagp.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/intrface/busintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/b... ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/intrface/cardbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/c... ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/intrface/devhere.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/d... ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/devhere.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/devhere.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/intrface/ideintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/i... ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/ideintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/ideintrf.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/intrface/intrface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/i... ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/intrface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/intrface.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/l... ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/intrface/locintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/l... ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/p... ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/intrface/routintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/r... ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev=... ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -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)
Modified: trunk/reactos/drivers/bus/pcix/pci/busno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/busno.... ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/busno.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,10 +9,9 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h> - -/* GLOBALS ********************************************************************/
/* FUNCTIONS ******************************************************************/
Modified: trunk/reactos/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/config... ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/pci/devhere.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/devher... ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/devhere.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/devhere.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/pci/id.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/id.c?r... ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,11 +9,10 @@ /* INCLUDES *******************************************************************/
#include <pci.h> +#include <stdio.h> + #define NDEBUG #include <debug.h> -#include "stdio.h" - -/* GLOBALS ********************************************************************/
/* FUNCTIONS ******************************************************************/
Modified: trunk/reactos/drivers/bus/pcix/pci/ppbridge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/ppbrid... ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,10 +9,9 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h> - -/* GLOBALS ********************************************************************/
/* FUNCTIONS ******************************************************************/
Modified: trunk/reactos/drivers/bus/pcix/pci/romimage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/romima... ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/romimage.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/romimage.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/pci/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/state.... ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/state.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/state.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/pcivrify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcivrify.c... ============================================================================== --- trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pcivrify.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pdo.c?rev=... ============================================================================== --- trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/power.c?re... ============================================================================== --- trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/power.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/usage.c?re... ============================================================================== --- trunk/reactos/drivers/bus/pcix/usage.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/usage.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?re... ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Sat Jan 4 12:05:02 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/
#include <pci.h> + #define NDEBUG #include <debug.h>