diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-04-26 23:05:10 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-04-26 23:05:10 +0000 |
| commit | a6e229366d0644b97cbd0ec4392e4517fce3dbf8 (patch) | |
| tree | 35fc3ddcebcd04e38cac5dc865012390fa46ae66 /c/src | |
| parent | 2005-04-26 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-a6e229366d0644b97cbd0ec4392e4517fce3dbf8.tar.bz2 | |
2005-04-26 Joel Sherrill <joel@OARcorp.com>
* pci/pcibios.c: Reformatted.
Diffstat (limited to 'c/src')
| -rw-r--r-- | c/src/lib/libbsp/i386/shared/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/shared/pci/pcibios.c | 36 |
2 files changed, 21 insertions, 19 deletions
diff --git a/c/src/lib/libbsp/i386/shared/ChangeLog b/c/src/lib/libbsp/i386/shared/ChangeLog index 55adb20a53..19a95b8424 100644 --- a/c/src/lib/libbsp/i386/shared/ChangeLog +++ b/c/src/lib/libbsp/i386/shared/ChangeLog @@ -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> * irq/irq.c, irq/irq.h, irq/irq_asm.S, irq/irq_init.c: Added parameter diff --git a/c/src/lib/libbsp/i386/shared/pci/pcibios.c b/c/src/lib/libbsp/i386/shared/pci/pcibios.c index 6423ead089..f6809053e4 100644 --- a/c/src/lib/libbsp/i386/shared/pci/pcibios.c +++ b/c/src/lib/libbsp/i386/shared/pci/pcibios.c @@ -184,7 +184,7 @@ pci_find_device( ) { int status; - int sig; + int sig = 0; status = pcib_find_by_devid( vendorid, deviceid, instance, &sig ); @@ -241,25 +241,23 @@ BusCountPCI() { if( ucBusCount == 0xff ) { - unsigned char bus,dev,hd; - unsigned int d; + unsigned char bus; + unsigned char dev; + unsigned char hd = 0; + unsigned int d = 0; int sig; ucBusCount = 0; - for(bus=0; bus< 0xff; bus++) - { - for(dev=0; dev<PCI_MAX_DEVICES; dev++) - { + for (bus=0; bus< 0xff; bus++) { + for (dev=0; dev<PCI_MAX_DEVICES; dev++) { sig = PCIB_DEVSIG_MAKE(bus,dev,0); pcib_conf_read32(sig, PCI_VENDOR_ID, &d); - if( d != -1 ) - { + if( d != -1 ) { 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); if( hd > ucBusCount ) @@ -270,13 +268,10 @@ BusCountPCI() } - if( ucBusCount == 0 ) - { + if( ucBusCount == 0 ) { printk("BusCountPCI() found 0 busses, assuming 1\n"); ucBusCount = 1; - } - else if( ucBusCount == 0xff ) - { + } else if( ucBusCount == 0xff ) { printk("BusCountPCI() found 0xff busses, assuming 1\n"); ucBusCount = 1; } @@ -291,9 +286,12 @@ BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid, int instance, int *pbus, int *pdev, int *pfun ) { int sig; - unsigned int d; - unsigned short s; - unsigned char bus,dev,fun,hd; + unsigned int d = 0; + unsigned short s = 0; + unsigned char bus; + unsigned char dev; + unsigned char fun; + unsigned char hd = 0; for (bus=0; bus<BusCountPCI(); bus++) { |