From 09d22dbdea052241efe659ff4f0ad0f15b71d7ba Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Sat, 28 May 2005 00:24:46 +0000 Subject: [PATCH] Build pci with w32api svn path=/trunk/; revision=15556 --- reactos/drivers/bus/pci/makefile | 2 +- reactos/drivers/bus/pci/pci.c | 1 + reactos/drivers/bus/pci/pdo.c | 5 ++--- reactos/w32api/include/ddk/winddk.h | 11 +++++++++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/reactos/drivers/bus/pci/makefile b/reactos/drivers/bus/pci/makefile index 7520ca11c4c..86bb78e44b8 100644 --- a/reactos/drivers/bus/pci/makefile +++ b/reactos/drivers/bus/pci/makefile @@ -6,7 +6,7 @@ TARGET_TYPE = driver TARGET_NAME = pci -TARGET_CFLAGS = -Wall -Werror +TARGET_CFLAGS = -Wall -Werror -D__USE_W32API TARGET_OBJECTS = fdo.o pci.o pdo.o diff --git a/reactos/drivers/bus/pci/pci.c b/reactos/drivers/bus/pci/pci.c index 8dd5c4074d2..1c1b55f0ad0 100644 --- a/reactos/drivers/bus/pci/pci.c +++ b/reactos/drivers/bus/pci/pci.c @@ -9,6 +9,7 @@ */ #include +#include #include "pcidef.h" #include "pci.h" diff --git a/reactos/drivers/bus/pci/pdo.c b/reactos/drivers/bus/pci/pdo.c index 6a738a962e6..585af9c7662 100644 --- a/reactos/drivers/bus/pci/pdo.c +++ b/reactos/drivers/bus/pci/pdo.c @@ -9,15 +9,14 @@ */ #include - +#include +#include #include "pcidef.h" #include "pci.h" #define NDEBUG #include -DEFINE_GUID(GUID_BUS_TYPE_PCI, 0xc8ebdfb0L, 0xb510, 0x11d0, 0x80, 0xe5, 0x00, 0xa0, 0xc9, 0x25, 0x42, 0xe3); - /*** PRIVATE *****************************************************************/ static NTSTATUS diff --git a/reactos/w32api/include/ddk/winddk.h b/reactos/w32api/include/ddk/winddk.h index 03b564e981f..09bbba0392e 100644 --- a/reactos/w32api/include/ddk/winddk.h +++ b/reactos/w32api/include/ddk/winddk.h @@ -3231,6 +3231,17 @@ typedef struct _PCI_COMMON_CONFIG { #define PCI_INVALID_VENDORID 0xFFFF #define PCI_COMMON_HDR_LENGTH (FIELD_OFFSET(PCI_COMMON_CONFIG, DeviceSpecific)) +#define PCI_ADDRESS_IO_SPACE 0x01 +#define PCI_ADDRESS_MEMORY_TYPE_MASK 0x06 +#define PCI_ADDRESS_MEMORY_PREFETCHABLE 0x08 +#define PCI_ADDRESS_IO_ADDRESS_MASK 0xfffffffc +#define PCI_ADDRESS_MEMORY_ADDRESS_MASK 0xfffffff0 +#define PCI_ADDRESS_ROM_ADDRESS_MASK 0xfffff800 + +#define PCI_TYPE_32BIT 0 +#define PCI_TYPE_20BIT 2 +#define PCI_TYPE_64BIT 4 + typedef struct _PCI_SLOT_NUMBER { union { struct {