diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-08-05 20:13:45 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-08-05 20:13:45 +0000 |
commit | 6e242f010c00ca9087fcb89329017a3729023b60 (patch) | |
tree | 56394dfb08bb1444e577ac79177237f1f21d4b4b /c/src/lib/libbsp | |
parent | 2002-08-05 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-6e242f010c00ca9087fcb89329017a3729023b60.tar.bz2 |
2002-08-05 Eric Norum <eric.norum@usask.ca>
* pci/pcibios.c: Per PR262, removed all asserts so probes for
devices that are not present will work. This lets you have
multiple PCI Ethernet drivers in an application and dynamically
use the one for the card othat is present.
Diffstat (limited to 'c/src/lib/libbsp')
-rw-r--r-- | c/src/lib/libbsp/i386/shared/ChangeLog | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/shared/pci/pcibios.c | 15 |
2 files changed, 7 insertions, 15 deletions
diff --git a/c/src/lib/libbsp/i386/shared/ChangeLog b/c/src/lib/libbsp/i386/shared/ChangeLog index ac365b9609..1c809aa3df 100644 --- a/c/src/lib/libbsp/i386/shared/ChangeLog +++ b/c/src/lib/libbsp/i386/shared/ChangeLog @@ -1,3 +1,10 @@ +2002-08-05 Eric Norum <eric.norum@usask.ca> + + * pci/pcibios.c: Per PR262, removed all asserts so probes for + devices that are not present will work. This lets you have + multiple PCI Ethernet drivers in an application and dynamically + use the one for the card othat is present. + 2002-07-16 Eric Norum <eric.norum@usask.ca> * comm/uart.c: I am using a PC-104 card with no video output. I diff --git a/c/src/lib/libbsp/i386/shared/pci/pcibios.c b/c/src/lib/libbsp/i386/shared/pci/pcibios.c index 483e5df2a9..5bf7fba2c8 100644 --- a/c/src/lib/libbsp/i386/shared/pci/pcibios.c +++ b/c/src/lib/libbsp/i386/shared/pci/pcibios.c @@ -9,7 +9,6 @@ #include <rtems.h> #include <bsp.h> -#include <assert.h> #include <pcibios.h> /* @@ -75,7 +74,6 @@ pcib_init(void) if(ucp >= (unsigned char *)0xFFFFF) { /* BIOS-32 not found */ - assert(0); return PCIB_ERR_NOTPRESENT; } @@ -99,7 +97,6 @@ pcib_init(void) if((pcibExchg[0] & 0xff) != 0) { /* Not found */ - assert(0); return PCIB_ERR_NOTPRESENT; } @@ -124,14 +121,12 @@ pcib_init(void) if((pcibExchg[0] & 0xff00) != 0) { /* Not found */ - assert(0); return PCIB_ERR_NOTPRESENT; } if(pcibExchg[3] != 0x20494350) { /* Signature does not match */ - assert(0); return PCIB_ERR_NOTPRESENT; } @@ -150,7 +145,6 @@ pcib_find_by_devid(int vendorId, int devId, int idx, int *sig) { if(!pcibInitialized) { - assert(0); return PCIB_ERR_UNINITIALIZED; } @@ -186,7 +180,6 @@ pcib_find_by_class(int classCode, int idx, int *sig) { if(!pcibInitialized) { - assert(0); return PCIB_ERR_UNINITIALIZED; } @@ -226,7 +219,6 @@ pcib_special_cycle(int busNo, int data) { if(!pcibInitialized) { - assert(0); return PCIB_ERR_UNINITIALIZED; } @@ -258,7 +250,6 @@ pcib_conf_read8(int sig, int off, unsigned char *data) { if(!pcibInitialized) { - assert(0); return PCIB_ERR_UNINITIALIZED; } @@ -297,7 +288,6 @@ pcib_conf_read16(int sig, int off, unsigned short *data) { if(!pcibInitialized) { - assert(0); return PCIB_ERR_UNINITIALIZED; } @@ -336,7 +326,6 @@ pcib_conf_read32(int sig, int off, unsigned int *data) { if(!pcibInitialized) { - assert(0); return PCIB_ERR_UNINITIALIZED; } @@ -375,7 +364,6 @@ pcib_conf_write8(int sig, int off, unsigned int data) { if(!pcibInitialized) { - assert(0); return PCIB_ERR_UNINITIALIZED; } @@ -407,7 +395,6 @@ pcib_conf_write16(int sig, int off, unsigned int data) { if(!pcibInitialized) { - assert(0); return PCIB_ERR_UNINITIALIZED; } @@ -441,7 +428,6 @@ pcib_conf_write32(int sig, int off, unsigned int data) { if(!pcibInitialized) { - assert(0); return PCIB_ERR_UNINITIALIZED; } @@ -482,7 +468,6 @@ pcib_convert_err(int err) case 0x87: return PCIB_ERR_BADREG; default: - assert(0); break; } return PCIB_ERR_NOFUNC; |