diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-05-21 15:18:14 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-05-21 15:18:14 +0000 |
| commit | 1402d56abf125a8317ce8a6659f6ba2e5bde5eb1 (patch) | |
| tree | d55b479e82ba08cfd418203a2ae862ccec115544 /c/src/libchip/network/dec21140.c | |
| parent | 2004-05-21 Till Strauman <strauman@slac.stanford.edu> (diff) | |
| download | rtems-1402d56abf125a8317ce8a6659f6ba2e5bde5eb1.tar.bz2 | |
2004-05-21 Till Strauman <strauman@slac.stanford.edu>
* PR/625/networking
* libchip/network/dec21140.c, ... : Prevent name clashes by making
'ld_le32()' etc. static inlines. Let dec21140 attach routine return
an error rather than panic if no chip is detected (thus allowing
for probing).
* libchip/network/elnk.c: Let elnk bail out if autoneg never completes
instead of looping forever. Avoid divide by zero (crashed my PC).
* libchip/network/if_fxp.c: Enable more fxp chip variants but warn that
they are UNTESTED.
Diffstat (limited to '')
| -rw-r--r-- | c/src/libchip/network/dec21140.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c index 11b53ca40d..561b36dbe6 100644 --- a/c/src/libchip/network/dec21140.c +++ b/c/src/libchip/network/dec21140.c @@ -244,12 +244,12 @@ extern void Wait_X_ms( unsigned int timeToWait ); #define rtems_bsp_delay_in_bus_cycles(cycle) Wait_X_ms( cycle/100 ) #define CPU_CACHE_ALIGNMENT_FOR_BUFFER PG_SIZE -inline void st_le32(volatile uint32_t *addr, uint32_t value) +static inline void st_le32(volatile uint32_t *addr, uint32_t value) { *(addr)=value ; } -inline uint32_t ld_le32(volatile uint32_t *addr) +static inline uint32_t ld_le32(volatile uint32_t *addr) { return(*addr); } @@ -1062,7 +1062,10 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) if ( diag == PCIB_ERR_SUCCESS) printk( "DEC/Intel 21143 PCI network card found\n" ); else - rtems_panic("DEC PCI network card not found !!\n"); + { + printk("No DEC/Intel 21140/3 PCI network card found !!\n"); + return 0; + } } #endif #if defined(__PPC__) |