diff options
author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-05-04 19:33:46 +0000 |
---|---|---|
committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-05-04 19:33:46 +0000 |
commit | 548ed3f040e6bb39480b052742e0b7e012385141 (patch) | |
tree | fe5ecf9c8deb298d9794de1d2be495e2a793411d /c/src/lib/libbsp/powerpc | |
parent | 2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com> (diff) | |
download | rtems-548ed3f040e6bb39480b052742e0b7e012385141.tar.bz2 |
2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com>
* irq/irq_init.c, pci/pci.c, pci/pcifinddevice.c, startup/bspstart.c:
Name change to support common PCI interface
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/irq/irq_init.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/pci/pci.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/startup/bspstart.c | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog index afc5ca781a..0b5c948550 100644 --- a/c/src/lib/libbsp/powerpc/shared/ChangeLog +++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog @@ -1,3 +1,8 @@ +2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com> + + * irq/irq_init.c, pci/pci.c, pci/pcifinddevice.c, startup/bspstart.c: + Name change to support common PCI interface + 2005-04-26 Joel Sherrill <joel@OARcorp.com> * console/uart.h: Eliminate tabs. diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c index 492e902da2..0f93fd4b35 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c @@ -159,7 +159,7 @@ void VIA_isa_bridge_interrupts_setup(void) unsigned char maxBus; unsigned found = 0; - maxBus = BusCountPCI(); + maxBus = pci_bus_count(); pci_dev.function = 0; /* Assumes the bidge is the first function */ for (pci_dev.bus = 0; pci_dev.bus < maxBus; pci_dev.bus++) { diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.c b/c/src/lib/libbsp/powerpc/shared/pci/pci.c index 8036d35455..67268ea1cb 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/pci.c +++ b/c/src/lib/libbsp/powerpc/shared/pci/pci.c @@ -332,7 +332,7 @@ static int FindPCIbridge( int mybus, struct pcibridge *pb ) uint8_t bussec, buspri; uint16_t devid, vendorid, dclass; - for(pbus=0; pbus< BusCountPCI(); pbus++) { + for(pbus=0; pbus< pci_bus_count(); pbus++) { for(pslot=0; pslot< PCI_MAX_DEVICES; pslot++) { pci_read_config_word(pbus, pslot, 0, PCI_DEVICE_ID, &devid); if ( devid == 0xffff ) continue; @@ -382,7 +382,7 @@ void FixupPCI( const struct _int_map *bspmap, int (*swizzler)(int,int) ) * trivially use INTERRUPT_NAME to hook up with devices. */ - for (pbus=0; pbus< BusCountPCI(); pbus++) { + for (pbus=0; pbus< pci_bus_count(); pbus++) { for (pslot=0; pslot< PCI_MAX_DEVICES; pslot++) { pci_read_config_word(pbus, pslot, 0, PCI_DEVICE_ID, &devid); if ( devid == 0xffff ) continue; @@ -608,7 +608,7 @@ int pci_initialize() /* * Return the number of PCI busses in the system */ -unsigned char BusCountPCI() +unsigned char pci_bus_count() { return (ucMaxPCIBus+1); } diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c b/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c index 4662e873d2..2c2c011dca 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c +++ b/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c @@ -26,7 +26,7 @@ pci_find_device( unsigned short s; unsigned char bus,dev,fun,hd; - for (bus=0; bus<BusCountPCI(); bus++) { + for (bus=0; bus<pci_bus_count(); bus++) { for (dev=0; dev<PCI_MAX_DEVICES; dev++) { pci_read_config_byte(bus,dev,0, PCI_HEADER_TYPE, &hd); diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c index dcaa50abd5..b19e566aa8 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c @@ -413,7 +413,7 @@ void bsp_start( void ) } #ifdef SHOW_MORE_INIT_SETTINGS - printk("Number of PCI buses found is : %d\n", BusCountPCI()); + printk("Number of PCI buses found is : %d\n", pci_bus_count()); #endif #ifdef TEST_RAW_EXCEPTION_CODE printk("Testing exception handling Part 1\n"); |