Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 13:59:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch by Daniel Zimmermann <netzimme@aim.com>:

Browse source 
[DDK]: Add PCI_ADDRESS_MEMORY_SPACE.
[HAL]: Use it in HalpAssignPCISlotResources.

svn path=/trunk/; revision=45611
This commit is contained in:
Sir Richard 2010-02-18 17:00:09 +00:00
parent be43595873
commit de3d0b9d0c
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/hal/halx86/generic/bus/pcibus.c
View file

@ -614,7 +614,7 @@ HalpAssignPCISlotResources(IN PBUS_HANDLER BusHandler,
{ {
if (0 != PciConfig.u.type0.BaseAddresses[Address]) 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)) (PciConfig.u.type0.BaseAddresses[Address] & 0x1))
{ {
Descriptor->Type = CmResourceTypeMemory; Descriptor->Type = CmResourceTypeMemory;

7
reactos/include/ddk/winddk.h
View file

@ -4063,9 +4063,10 @@ typedef struct _PCI_COMMON_CONFIG {
#define PCI_INVALID_VENDORID 0xFFFF #define PCI_INVALID_VENDORID 0xFFFF
#define PCI_COMMON_HDR_LENGTH (FIELD_OFFSET(PCI_COMMON_CONFIG, DeviceSpecific)) #define PCI_COMMON_HDR_LENGTH (FIELD_OFFSET(PCI_COMMON_CONFIG, DeviceSpecific))
#define PCI_ADDRESS_IO_SPACE 0x01 #define PCI_ADDRESS_MEMORY_SPACE 0x00000000
#define PCI_ADDRESS_MEMORY_TYPE_MASK 0x06 #define PCI_ADDRESS_IO_SPACE 0x00000001
#define PCI_ADDRESS_MEMORY_PREFETCHABLE 0x08 #define PCI_ADDRESS_MEMORY_TYPE_MASK 0x00000006
#define PCI_ADDRESS_MEMORY_PREFETCHABLE 0x00000008
#define PCI_ADDRESS_IO_ADDRESS_MASK 0xfffffffc #define PCI_ADDRESS_IO_ADDRESS_MASK 0xfffffffc
#define PCI_ADDRESS_MEMORY_ADDRESS_MASK 0xfffffff0 #define PCI_ADDRESS_MEMORY_ADDRESS_MASK 0xfffffff0
#define PCI_ADDRESS_ROM_ADDRESS_MASK 0xfffff800 #define PCI_ADDRESS_ROM_ADDRESS_MASK 0xfffff800