Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-06 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

2005-04-26 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* pci/pcibios.c: Reformatted.
This commit is contained in:
Joel Sherrill
2005-04-26 23:05:10 +00:00
parent b607d9c89a
commit a6e229366d
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/i386/shared/ChangeLog
View File

@@ -1,3 +1,7 @@
2005-04-26 Joel Sherrill <joel@OARcorp.com>
* pci/pcibios.c: Reformatted.
2005-04-18 Eric Valette <eric.valette@free.fr> 2005-04-18 Eric Valette <eric.valette@free.fr>
* irq/irq.c, irq/irq.h, irq/irq_asm.S, irq/irq_init.c: Added parameter * irq/irq.c, irq/irq.h, irq/irq_asm.S, irq/irq_init.c: Added parameter

36
c/src/lib/libbsp/i386/shared/pci/pcibios.c
View File

@@ -184,7 +184,7 @@ pci_find_device(
) )
{ {
int status; int status;
int sig; int sig = 0;
status = pcib_find_by_devid( vendorid, deviceid, instance, &sig ); status = pcib_find_by_devid( vendorid, deviceid, instance, &sig );
@@ -241,25 +241,23 @@ BusCountPCI()
{ {
if( ucBusCount == 0xff ) if( ucBusCount == 0xff )
{ {
unsigned char bus,dev,hd; unsigned char bus;
unsigned int d; unsigned char dev;
unsigned char hd = 0;
unsigned int d = 0;
int sig; int sig;
ucBusCount = 0; ucBusCount = 0;
for(bus=0; bus< 0xff; bus++) for (bus=0; bus< 0xff; bus++) {
{ for (dev=0; dev<PCI_MAX_DEVICES; dev++) {
for(dev=0; dev<PCI_MAX_DEVICES; dev++)
{
sig = PCIB_DEVSIG_MAKE(bus,dev,0); sig = PCIB_DEVSIG_MAKE(bus,dev,0);
pcib_conf_read32(sig, PCI_VENDOR_ID, &d); pcib_conf_read32(sig, PCI_VENDOR_ID, &d);
if( d != -1 ) if( d != -1 ) {
{
pcib_conf_read32(sig, PCI_CLASS_REVISION, &d); pcib_conf_read32(sig, PCI_CLASS_REVISION, &d);
if( (d >> 16) == PCI_CLASS_BRIDGE_PCI ) if( (d >> 16) == PCI_CLASS_BRIDGE_PCI ) {
{
pcib_conf_read8(sig, PCI_SUBORDINATE_BUS, &hd); pcib_conf_read8(sig, PCI_SUBORDINATE_BUS, &hd);
if( hd > ucBusCount ) if( hd > ucBusCount )
@@ -270,13 +268,10 @@ BusCountPCI()
} }
if( ucBusCount == 0 ) if( ucBusCount == 0 ) {
{
printk("BusCountPCI() found 0 busses, assuming 1\n"); printk("BusCountPCI() found 0 busses, assuming 1\n");
ucBusCount = 1; ucBusCount = 1;
} } else if( ucBusCount == 0xff ) {
else if( ucBusCount == 0xff )
{
printk("BusCountPCI() found 0xff busses, assuming 1\n"); printk("BusCountPCI() found 0xff busses, assuming 1\n");
ucBusCount = 1; ucBusCount = 1;
} }
@@ -291,9 +286,12 @@ BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
int instance, int *pbus, int *pdev, int *pfun ) int instance, int *pbus, int *pdev, int *pfun )
{ {
int sig; int sig;
unsigned int d; unsigned int d = 0;
unsigned short s; unsigned short s = 0;
unsigned char bus,dev,fun,hd; unsigned char bus;
unsigned char dev;
unsigned char fun;
unsigned char hd = 0;
for (bus=0; bus<BusCountPCI(); bus++) for (bus=0; bus<BusCountPCI(); bus++)
{ {