diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-03-14 21:42:55 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-03-14 21:42:55 +0000 |
commit | 48e329fbd6e0b1ccbe494b83a672055a47a9b7ed (patch) | |
tree | b3302fb95431c7a7ddcdc89c81bfc0eac28ff889 /c/src | |
parent | 2005-03-14 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-48e329fbd6e0b1ccbe494b83a672055a47a9b7ed.tar.bz2 |
2005-03-14 Joel Sherrill <joel@OARcorp.com>
* pci/pci.h, pci/pcifinddevice.c: Continue PCI API unification. All use
pci_find_device().
Diffstat (limited to 'c/src')
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/pci/pci.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/pci/pcifinddevice.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index a310e80ca8..915127f786 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog @@ -1,3 +1,8 @@ +2005-03-14 Joel Sherrill <joel@OARcorp.com> + + * pci/pci.h, pci/pcifinddevice.c: Continue PCI API unification. All use + pci_find_device(). + 2005-03-04 Joel Sherrill <joel@OARcorp.com> * pci/pci.c, pci/pci.h, startup/bspstart.c: Make PCI initialize diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.h b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.h index 87db5fc043..d4a31d9369 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.h +++ b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.h @@ -1194,7 +1194,7 @@ extern void pci_initialize(); int BSP_PCIxFindDevice(unsigned short vendorid, unsigned short deviceid, int instance, int pciNum, int *pbus, int *pdev, int *pfun ); -int BSP_pciFindDevice(unsigned short vendorid, unsigned short deviceid, +int pci_find_device(unsigned short vendorid, unsigned short deviceid, int instance, int *pbus, int *pdev, int *pfun); #endif /* RTEMS_PCI_H */ diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/pcifinddevice.c b/c/src/lib/libbsp/powerpc/mvme5500/pci/pcifinddevice.c index dc430eb08c..67160781a3 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/pci/pcifinddevice.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/pci/pcifinddevice.c @@ -40,7 +40,7 @@ int BSP_PCIxFindDevice(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_device: found 0x%08x at %d/%d/%d\n",d,bus,dev,fun); #endif (void)PCIx_read_config_word(pciNum, bus,dev,fun,PCI0_VENDOR_ID,&s); if (vendorid != s) @@ -57,7 +57,7 @@ int BSP_PCIxFindDevice(unsigned short vendorid, unsigned short deviceid, return -1; } -int BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid, +int pci_find_device( unsigned short vendorid, unsigned short deviceid, int instance, int *pbus, int *pdev, int *pfun ) { return(BSP_PCIxFindDevice(vendorid,deviceid,instance,0,pbus,pdev,pfun)); |