diff options
| author | lile <lile@FreeBSD.org> | 2000-10-10 00:54:02 +0000 |
|---|---|---|
| committer | lile <lile@FreeBSD.org> | 2000-10-10 00:54:02 +0000 |
| commit | 53d0f58f816729e56331b92d8070bb77a025c1cf (patch) | |
| tree | 259efc4c690133bdc9778056381ba421e6225356 /sys/contrib/dev | |
| parent | 4d8e577298f9bc8ad1e6532666f73f64c8bd613f (diff) | |
| download | FreeBSD-src-53d0f58f816729e56331b92d8070bb77a025c1cf.zip FreeBSD-src-53d0f58f816729e56331b92d8070bb77a025c1cf.tar.gz | |
o Change TX_BUFFER_LEN from 512 to 2048.
o Remove bogus "spurious interrupt" message.
o Ring buffer head and avail were incorrectly calculated.
o Fix fragment count.
o Fix ring entry for single station, default to 16Mbit.
o Don't complain about long frames.
Diffstat (limited to 'sys/contrib/dev')
| -rw-r--r-- | sys/contrib/dev/oltr/if_oltr.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c index 89fd603..38da767 100644 --- a/sys/contrib/dev/oltr/if_oltr.c +++ b/sys/contrib/dev/oltr/if_oltr.c @@ -176,7 +176,7 @@ struct oltr_tx_buf { #define RING_BUFFER_LEN 16 #define RING_BUFFER(x) ((RING_BUFFER_LEN - 1) & x) #define RX_BUFFER_LEN 2048 -#define TX_BUFFER_LEN 512 +#define TX_BUFFER_LEN 2048 struct oltr_softc { struct arpcom arpcom; @@ -718,9 +718,7 @@ oltr_intr(void *xsc) if (DEBUG_MASK & DEBUG_INT) printf("I"); - if (TRlldInterruptService(sc->TRlldAdapter) == 0) - if (sc->state > OL_CLOSED) - printf("oltr%d: spurious interrupt\n", sc->unit); + TRlldInterruptService(sc->TRlldAdapter); return; } @@ -788,8 +786,8 @@ outloop: goto bad; } - sc->tx_avail -= sc->frame_ring[frame].FragmentCount++; - sc->tx_head += sc->frame_ring[frame].FragmentCount++; + sc->tx_avail -= sc->frame_ring[frame].FragmentCount; + sc->tx_head = RING_BUFFER((sc->tx_head + sc->frame_ring[frame].FragmentCount)); sc->tx_frame++; #if (NBPFILTER > 0) || (__FreeBSD_version > 400000) @@ -1268,6 +1266,13 @@ DriverStatus(void *DriverHandle, TRlldStatus_t *Status) } break; case TRLLD_STS_INIT_STATUS: + if (Status->Specification.InitStatus == 0x800) { + oltr_stop(sc); + ifmedia_set(&sc->ifmedia, IFM_TOKEN|IFM_TOK_UTP16); + TRlldSetSpeed(sc->TRlldAdapter, TRLLD_SPEED_16MBPS); + oltr_init(sc); + break; + } printf("oltr%d: adapter init failure 0x%03x\n", sc->unit, Status->Specification.InitStatus); oltr_stop(sc); |
