diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index 95e773b056..3194bcc263 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,14 @@ +2004-05-21 Till Strauman + + * PR/625/networking + * 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). + * network/elnk.c: Let elnk bail out if autoneg never completes + instead of looping forever. Avoid divide by zero (crashed my PC). + * network/if_fxp.c: Enable more fxp chip variants but warn that + they are UNTESTED. + 2003-09-26 Cedric Aubert PR 499/rtems_misc diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c index 960c4f37c7..3d52bec1e8 100644 --- a/c/src/libchip/network/dec21140.c +++ b/c/src/libchip/network/dec21140.c @@ -243,12 +243,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 unsigned32 *addr, unsigned32 value) +static inline void st_le32(volatile unsigned32 *addr, unsigned32 value) { *(addr)=value ; } -inline unsigned32 ld_le32(volatile unsigned32 *addr) +static inline unsigned32 ld_le32(volatile unsigned32 *addr) { return(*addr); } @@ -1061,7 +1061,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) diff --git a/c/src/libchip/network/elnk.c b/c/src/libchip/network/elnk.c index d9b5fd2666..024bbad8fe 100644 --- a/c/src/libchip/network/elnk.c +++ b/c/src/libchip/network/elnk.c @@ -204,12 +204,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 unsigned32 *addr, unsigned32 value) +static inline void st_le32(volatile unsigned32 *addr, unsigned32 value) { *(addr)=value ; } -inline unsigned32 ld_le32(volatile unsigned32 *addr) +static inline unsigned32 ld_le32(volatile unsigned32 *addr) { return(*addr); } @@ -2669,7 +2669,9 @@ elnk_init (void *arg) xl_miibus_writereg(sc, 0x18, MII_ANAR, ANAR_10 | ANAR_TX | ANAR_10_FD | ANAR_TX_FD ); /* ANAR_T4 */ xl_miibus_writereg(sc, 0x18, MII_BMCR, BMCR_STARTNEG | BMCR_AUTOEN ); - while( ((sr = xl_miibus_readreg(sc, 0x18, MII_BMSR)) & BMSR_ACOMP) == 0 ); + + for (i=0; ((sr = xl_miibus_readreg(sc, 0x18, MII_BMSR)) & BMSR_ACOMP) == 0 && i < 20; i++) + DELAY(10000); } @@ -2997,7 +2999,7 @@ elnk_stats (struct elnk_softc *sc) printf(" interrupts:%-9d txcmp_ints:%-5d avg_chain_len:%-4d\n", sc->xl_stats.device_interrupts, sc->xl_stats.txcomplete_ints, - (totalLengths / numLengths) ); + numLengths ? (totalLengths / numLengths) : -1 ); } printf(" carrier_lost:%-5d sqe_errs:%-5d\n", @@ -3120,8 +3122,6 @@ struct el_boards int pbus,pdev,pfun, vid, did, tindex; }; - - /* * Attach an ELNK driver to the system */ diff --git a/c/src/libchip/network/if_fxp.c b/c/src/libchip/network/if_fxp.c index 93aa66a506..cd6bf9b937 100644 --- a/c/src/libchip/network/if_fxp.c +++ b/c/src/libchip/network/if_fxp.c @@ -182,8 +182,11 @@ static u_char fxp_cb_config_template[] = { struct fxp_ident { u_int16_t devid; char *name; + int warn; }; +#define UNTESTED 1 + /* * Claim various Intel PCI device identifiers for this driver. The * sub-vendor and sub-device field are extensively used to identify @@ -191,28 +194,19 @@ struct fxp_ident { * them. */ static struct fxp_ident fxp_ident_table[] = { -#ifdef NOTUSED - /* currently untested */ - { 0x1229, "Intel Pro 10/100B/100+ Ethernet" }, - { 0x2449, "Intel Pro/100 Ethernet" }, -#endif - { 0x1209, "Intel Embedded 10/100 Ethernet" }, -#ifdef NOTUSED - /* currently untested */ - { 0x1029, "Intel Pro/100 Ethernet" }, -#endif - { 0x1030, "Intel Pro/100 Ethernet" }, -#ifdef NOTUSED - /* currently untested */ - { 0x1031, "Intel Pro/100 Ethernet" }, - { 0x1032, "Intel Pro/100 Ethernet" }, - { 0x1033, "Intel Pro/100 Ethernet" }, - { 0x1034, "Intel Pro/100 Ethernet" }, - { 0x1035, "Intel Pro/100 Ethernet" }, - { 0x1036, "Intel Pro/100 Ethernet" }, - { 0x1037, "Intel Pro/100 Ethernet" }, - { 0x1038, "Intel Pro/100 Ethernet" }, -#endif + { 0x1229, "Intel Pro 10/100B/100+ Ethernet", UNTESTED }, + { 0x2449, "Intel Pro/100 Ethernet", UNTESTED }, + { 0x1209, "Intel Embedded 10/100 Ethernet", 0 }, + { 0x1029, "Intel Pro/100 Ethernet", UNTESTED }, + { 0x1030, "Intel Pro/100 Ethernet", 0 }, + { 0x1031, "Intel Pro/100 Ethernet", UNTESTED }, + { 0x1032, "Intel Pro/100 Ethernet", UNTESTED }, + { 0x1033, "Intel Pro/100 Ethernet", UNTESTED }, + { 0x1034, "Intel Pro/100 Ethernet", UNTESTED }, + { 0x1035, "Intel Pro/100 Ethernet", UNTESTED }, + { 0x1036, "Intel Pro/100 Ethernet", UNTESTED }, + { 0x1037, "Intel Pro/100 Ethernet", UNTESTED }, + { 0x1038, "Intel Pro/100 Ethernet", UNTESTED }, { 0, NULL }, }; @@ -473,8 +467,13 @@ rtems_fxp_attach(struct rtems_bsdnet_ifconfig *config, int attaching) DBGLVL_PRINTK(2,"fxp_attach: find_devid returned %d " "and pci signature 0x%x\n", i,sc->pci_signature); - if (PCIB_ERR_SUCCESS == i) + if (PCIB_ERR_SUCCESS == i) { + if ( UNTESTED == fxp_ident_table[j].warn ) { + device_printf(dev,"WARNING: this chip version has NOT been reported to work under RTEMS yet.\n"); + device_printf(dev," If it works OK, report it as tested in 'c/src/libchip/network/if_fxp.c'\n"); + } break; + } } }