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.
This commit is contained in:
Joel Sherrill
2004-11-10 23:57:58 +00:00
parent ac8f46289c
commit bd6566e6ad
2 changed files with 14 additions and 7 deletions

View File

@@ -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.

View File

@@ -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);
}
/*