Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor cleanup

This commit is contained in:
gwr 1996-04-07 05:47:26 +00:00
parent 639d1d787e
commit d1ca7d4c47
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/sun3/dev/kd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kd.c,v 1.14 1996/01/24 22:40:20 gwr Exp $ */
/* $NetBSD: kd.c,v 1.15 1996/04/07 05:47:26 gwr Exp $ */
/*
* Copyright (c) 1994, 1995 Gordon W. Ross
@ -360,7 +360,8 @@ static void kd_putfb(tp)
}
/*
* Our "interrupt" routine for input.
* Our "interrupt" routine for input. This is called by
* the keyboard driver (dev/sun/kbd.c) at spltty.
*/
void
kd_input(c)

28
sys/arch/sun3/dev/memerr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: memerr.c,v 1.1 1996/03/26 14:57:43 gwr Exp $ */
/* $NetBSD: memerr.c,v 1.2 1996/04/07 05:47:28 gwr Exp $ */
/*
* Copyright (c) 1992, 1993
@ -158,7 +158,7 @@ memerr_attach(parent, self, args)
* correctable errors and set ME_ECC_CE_ENA
* here so we can log them...
*/
mer->me_csr = ME_CSR_IENA; /* ME_ECC_CE_ENA ? */
mer->me_csr = ME_CSR_IENA; /* | ME_ECC_CE_ENA */
}
}
@ -192,11 +192,17 @@ memerr_interrupt(arg)
(ctx & 7), va, pa);
printf(" csr=%b\n", csr, sc->sc_csrbits);
/*
* If we have parity-checked memory, there is
* not much to be done. Any error is fatal.
*/
if (sc->sc_type == ME_PAR) {
if ((csr & ME_PAR_EMASK) == 0)
goto noerror;
/* Parity errors are fatal. */
goto die;
if (csr & ME_PAR_EMASK) {
/* Parity errors are fatal. */
goto die;
}
/* The IPEND bit was set, but no error bits. */
goto noerror;
}
/*
@ -207,12 +213,16 @@ memerr_interrupt(arg)
goto die;
}
if (csr & ME_ECC_UE) {
printf(" uncorrectable error\n");
printf(" uncorrectable ECC error\n");
goto die;
}
if (csr & ME_ECC_CE)
if (csr & ME_ECC_CE) {
/* Just log this and continue. */
memerr_correctable(sc);
goto recover;
goto recover;
}
/* The IPEND bit was set, but no error bits. */
goto noerror;
die:
panic("all bets are off...");