From d5373f352164b3c72b81dbcdb5acaca02517a9d6 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Wed, 6 May 1992 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1992-05-06 --- pc/devether.c | 3 ++- port/devcons.c | 2 +- port/devlance.c | 11 +++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pc/devether.c b/pc/devether.c index 6e45bb423fb2097fe39816e7d1e5a035af523ac0..f57409996ff21328a947d15e0d9d88cc4f8ae7f9 100644 --- a/pc/devether.c +++ b/pc/devether.c @@ -716,8 +716,9 @@ wd8013receive(Ctlr *cp) p = &((Ring*)hw->ram)[next]; len = ((p->len1<<8)|p->len0)-4; if(p->next < hw->pstart || p->next >= hw->pstop || len < 60){ - print("%d: #%2.2ux #%2.2ux #%2.2ux #%2.2ux\n", next, + print("%d/%d : #%2.2ux #%2.2ux #%2.2ux #%2.2ux\n", next, len, p->status, p->next, p->len0, p->len1); + panic("receive"); dp8390rinit(cp); return; } diff --git a/port/devcons.c b/port/devcons.c index 718716b2f073837364c32c5ec9b6ba73fbbc5ada..83976ddaa737e20d8589b28eb3c91c9e682702a7 100644 --- a/port/devcons.c +++ b/port/devcons.c @@ -325,13 +325,13 @@ consactive(void) } enum{ + Qdir, Qchal, Qclock, Qcons, Qconsctl, Qcputime, Qcrypt, - Qdir, Qkey, Qklog, Qlights, diff --git a/port/devlance.c b/port/devlance.c index 0e262a1ca8f1fffcdadf7d3fddc8adaf96e475ad..e537298bb19405be14a17ba728121e6a015c109a 100644 --- a/port/devlance.c +++ b/port/devlance.c @@ -336,8 +336,8 @@ lanceoput(Queue *q, Block *bp ) qlock(&l.tlock); if(waserror()){ - freeb(bp); qunlock(&l.tlock); + freeb(bp); nexterror(); } @@ -347,12 +347,11 @@ lanceoput(Queue *q, Block *bp ) */ tsleep(&l.tr, isobuf, (void *)0, 1000); if(isobuf(0) == 0 || l.misses > 4){ - l.misses = 0; -print("lance wedged, restarting\n"); - lancestart(0, 0); +print("lance wedged\n"); + qunlock(&l.tlock); freeb(bp); poperror(); - return; /* the interrupt routine will qunlock(&l.tlock) */ + return; } p = &l.tp[l.tc]; @@ -390,8 +389,8 @@ print("lance wedged, restarting\n"); l.tc = TSUCC(l.tc); *l.rdp = INEA|TDMD; /**/ wbflush(); - freeb(bp); qunlock(&l.tlock); + freeb(bp); poperror(); }