diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-10 23:57:58 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-10 23:57:58 +0000 |
| commit | bd6566e6ad89e36cf66b3f6b6f819766d40d51ef (patch) | |
| tree | 955330c3c44b781695b7a551ec6d25d4d574cce4 | |
| parent | 2004-11-10 Richard Campbell <richard.campbell@oarcorp.com> (diff) | |
| download | rtems-bd6566e6ad89e36cf66b3f6b6f819766d40d51ef.tar.bz2 | |
2004-11-10 Joel Sherrill <joel@oarcorp.com>
* include/rtems/pci.h: BSPs use the name BSP_pci_configuration not pci.
Also need to address that this largely duplicates
libbsp/powerpc/pci/pci.h but that file is not used when both are
included due to the same double inclusion protection.
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/include/rtems/pci.h | 14 |
2 files changed, 14 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 1fe83d25b1..69e78c41ca 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2004-11-10 Joel Sherrill <joel@oarcorp.com> + + * include/rtems/pci.h: BSPs use the name BSP_pci_configuration not pci. + Also need to address that this largely duplicates + libbsp/powerpc/pci/pci.h but that file is not used when both are + included due to the same double inclusion protection. + 2004-11-09 Joel Sherrill <joel@OARcorp.com> * libcsupport/include/stdint.h: Fixed name in @file. diff --git a/cpukit/include/rtems/pci.h b/cpukit/include/rtems/pci.h index 2070bb434d..1c25d8a287 100644 --- a/cpukit/include/rtems/pci.h +++ b/cpukit/include/rtems/pci.h @@ -1106,42 +1106,42 @@ typedef struct { pci_config_access_functions* pci_functions; } pci_config; -extern pci_config pci; +extern pci_config BSP_pci_configuration; extern inline int pci_read_config_byte(unsigned char bus, unsigned char slot, unsigned char function, unsigned char where, unsigned char * val) { - return pci.pci_functions->read_config_byte(bus, slot, function, where, val); + return BSP_pci_configuration.pci_functions->read_config_byte(bus, slot, function, where, val); } extern inline int pci_read_config_word(unsigned char bus, unsigned char slot, unsigned char function, unsigned char where, unsigned short * val) { - return pci.pci_functions->read_config_word(bus, slot, function, where, val); + return BSP_pci_configuration.pci_functions->read_config_word(bus, slot, function, where, val); } extern inline int pci_read_config_dword(unsigned char bus, unsigned char slot, unsigned char function, unsigned char where, unsigned int * val) { - return pci.pci_functions->read_config_dword(bus, slot, function, where, val); + return BSP_pci_configuration.pci_functions->read_config_dword(bus, slot, function, where, val); } extern inline int pci_write_config_byte(unsigned char bus, unsigned char slot, unsigned char function, unsigned char where, unsigned char val) { - return pci.pci_functions->write_config_byte(bus, slot, function, where, val); + return BSP_pci_configuration.pci_functions->write_config_byte(bus, slot, function, where, val); } extern inline int pci_write_config_word(unsigned char bus, unsigned char slot, unsigned char function, unsigned char where, unsigned short val) { - return pci.pci_functions->write_config_word(bus, slot, function, where, val); + return BSP_pci_configuration.pci_functions->write_config_word(bus, slot, function, where, val); } extern inline int pci_write_config_dword(unsigned char bus, unsigned char slot, unsigned char function, unsigned char where, unsigned int val) { - return pci.pci_functions->write_config_dword(bus, slot, function, where, val); + return BSP_pci_configuration.pci_functions->write_config_dword(bus, slot, function, where, val); } /* |