Author: sir_richard Date: Thu Feb 18 18:00:09 2010 New Revision: 45611
URL: http://svn.reactos.org/svn/reactos?rev=45611&view=rev Log: Patch by Daniel Zimmermann netzimme@aim.com: [DDK]: Add PCI_ADDRESS_MEMORY_SPACE. [HAL]: Use it in HalpAssignPCISlotResources.
Modified: trunk/reactos/hal/halx86/generic/bus/pcibus.c trunk/reactos/include/ddk/winddk.h
Modified: trunk/reactos/hal/halx86/generic/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/pcib... ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] Thu Feb 18 18:00:09 2010 @@ -614,7 +614,7 @@ { if (0 != PciConfig.u.type0.BaseAddresses[Address]) { - if (/*PCI_BASE_ADDRESS_SPACE_MEMORY*/ 0 == + if (PCI_ADDRESS_MEMORY_SPACE == (PciConfig.u.type0.BaseAddresses[Address] & 0x1)) { Descriptor->Type = CmResourceTypeMemory;
Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=45... ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Feb 18 18:00:09 2010 @@ -4063,9 +4063,10 @@ #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_MEMORY_SPACE 0x00000000 +#define PCI_ADDRESS_IO_SPACE 0x00000001 +#define PCI_ADDRESS_MEMORY_TYPE_MASK 0x00000006 +#define PCI_ADDRESS_MEMORY_PREFETCHABLE 0x00000008 #define PCI_ADDRESS_IO_ADDRESS_MASK 0xfffffffc #define PCI_ADDRESS_MEMORY_ADDRESS_MASK 0xfffffff0 #define PCI_ADDRESS_ROM_ADDRESS_MASK 0xfffff800