summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/lib/libbsp/powerpc/shared/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/shared/pci/pci.c2
-rw-r--r--c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/startup/bspstart.c2
4 files changed, 9 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog
index 03784d0e4b..a54e8c3875 100644
--- a/c/src/lib/libbsp/powerpc/shared/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-04 Joel Sherrill <joel@OARcorp.com>
+
+ * pci/pci.c, pci/pcifinddevice.c, startup/bspstart.c: Make PCI
+ initialize function part of the unified PCI API as pci_initialize().
+
2005-02-17 Ralf Corsepius <ralf.corsepius@rtems.org>
* startup/bspstart.c: Eliminate rtems_unsigned32.
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.c b/c/src/lib/libbsp/powerpc/shared/pci/pci.c
index 6d385e8aa7..940f03c6f6 100644
--- a/c/src/lib/libbsp/powerpc/shared/pci/pci.c
+++ b/c/src/lib/libbsp/powerpc/shared/pci/pci.c
@@ -521,7 +521,7 @@ void FixupPCI( const struct _int_map *bspmap, int (*swizzler)(int,int) )
/*
* This routine determines the maximum bus number in the system
*/
-void InitializePCI()
+void pci_initialize()
{
extern void detect_host_bridge();
unsigned char ucSlotNumber, ucFnNumber, ucNumFuncs;
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c b/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c
index 3371eefe6f..093a0fd4bc 100644
--- a/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c
+++ b/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c
@@ -14,7 +14,7 @@
#include <rtems/bspIo.h>
int
-BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
+pci_find_by_devid( unsigned short vendorid, unsigned short deviceid,
int instance, int *pbus, int *pdev, int *pfun )
{
unsigned int d;
@@ -37,7 +37,7 @@ BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
if (PCI_INVALID_VENDORDEVICEID == d)
continue;
#ifdef PCI_DEBUG
- printk("BSP_pciFindDevice: found 0x%08x at %d/%d/%d\n",d,bus,dev,fun);
+ printk("pci_find_by_devid: found 0x%08x at %d/%d/%d\n",d,bus,dev,fun);
#endif
(void) pci_read_config_word(bus,dev,fun,PCI_VENDOR_ID,&s);
if (vendorid != s)
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
index d4344a3276..dcaa50abd5 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
@@ -399,7 +399,7 @@ void bsp_start( void )
#ifdef SHOW_MORE_INIT_SETTINGS
printk("Going to start PCI buses scanning and initialization\n");
#endif
- InitializePCI();
+ pci_initialize();
{
const struct _int_map *bspmap = motorolaIntMap(currentBoard);