diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-05-16 16:04:10 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-05-16 16:11:44 -0500 |
| commit | 8bbf69e6e66aeee9add5b78d43c954e087b6a7f0 (patch) | |
| tree | 7666e597a8d72982a77ae46ffb71017e255feac4 /c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c | |
| parent | mvme5500 and cpukit pci.h - Eliminate mvme5500 specific pci.h (diff) | |
| download | rtems-8bbf69e6e66aeee9add5b78d43c954e087b6a7f0.tar.bz2 | |
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 <rtems/pci.h>.
+ sparc/*/pci*.c - Move to <rtems/pci.h> 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
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c index 6c7b2fd6a9..912e66e409 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c @@ -54,8 +54,6 @@ #define PCI1_CONFIG_DATA 0xc7c #endif -#define PCI_INVALID_VENDORDEVICEID 0xffffffff -#define PCI_MULTI_FUNCTION 0x80 #define HOSTBRIDGET_ERROR 0xf0000000 #define GT64x60_PCI_CONFIG_ADDR GT64x60_REG_BASE + PCI_CONFIG_ADDR @@ -367,7 +365,7 @@ int pci_initialize(void) 0, PCI_CACHE_LINE_SIZE, &ulHeader); - if ((ulHeader>>16)&PCI_MULTI_FUNCTION) + if ((ulHeader>>16)&PCI_HEADER_TYPE_MULTI_FUNCTION) ucNumFuncs=PCI_MAX_FUNCTIONS; else ucNumFuncs=1; |