From 8bbf69e6e66aeee9add5b78d43c954e087b6a7f0 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 16 May 2012 16:04:10 -0500 Subject: pci.h cleanup - Consolidate common defines to cpukit pci.h + libbsp/sparc/shared/include/pci.h was largely a copy of an older version of the cpukit pci.h. Removed much of the contents and included . + sparc/*/pci*.c - Move to required updating to use uint32_t for dword accesses. + Rename PCI_MULTI_FUNCTION to PCI_HEADER_TYPE_MULTI_FUNCTION + Define PCI_HEADER_TYPE_MULTI_FUNCTION in cpukit pci.h and remove PCI_MULTI_FUNCTION definitions in C files. + Move PCI_INVALID_VENDORDEVICEID definitions from various C files to cpukit pci.h --- cpukit/include/rtems/pci.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cpukit/include') diff --git a/cpukit/include/rtems/pci.h b/cpukit/include/rtems/pci.h index 31dcc0aa53..86ab4af241 100644 --- a/cpukit/include/rtems/pci.h +++ b/cpukit/include/rtems/pci.h @@ -33,6 +33,8 @@ extern "C" { #define PCI_VENDOR_ID 0x00 /* 16 bits */ #define PCI_DEVICE_ID 0x02 /* 16 bits */ +#define PCI_INVALID_VENDORDEVICEID 0xffffffff + #define PCI_COMMAND 0x04 /* 16 bits */ #define PCI_COMMAND_IO 0x0001 /* Enable response in I/O space */ #define PCI_COMMAND_MEMORY 0x0002 /* Enable response in Memory space */ @@ -67,10 +69,11 @@ extern "C" { #define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */ #define PCI_LATENCY_TIMER 0x0d /* 8 bits */ -#define PCI_HEADER_TYPE 0x0e /* 8 bits */ -#define PCI_HEADER_TYPE_NORMAL 0 -#define PCI_HEADER_TYPE_BRIDGE 1 -#define PCI_HEADER_TYPE_CARDBUS 2 +#define PCI_HEADER_TYPE 0x0e /* 8 bits */ +#define PCI_HEADER_TYPE_NORMAL 0x00 +#define PCI_HEADER_TYPE_BRIDGE 0x01 +#define PCI_HEADER_TYPE_CARDBUS 0x02 +#define PCI_HEADER_TYPE_MULTI_FUNCTION 0x80 #define PCI_BIST 0x0f /* 8 bits */ #define PCI_BIST_CODE_MASK 0x0f /* Return result */ @@ -375,6 +378,7 @@ extern "C" { #define PCI_DEVICE_ID_DEC_FDDI 0x000F #define PCI_DEVICE_ID_DEC_TULIP_PLUS 0x0014 #define PCI_DEVICE_ID_DEC_21142 0x0019 +#define PCI_DEVICE_ID_DEC_21143 0x0019 #define PCI_DEVICE_ID_DEC_21052 0x0021 #define PCI_DEVICE_ID_DEC_21150 0x0022 #define PCI_DEVICE_ID_DEC_21152 0x0024 -- cgit v1.2.3