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

Make sure we don't leave the interrupt masked after some errors.

This commit is contained in:
mycroft 1994-07-01 21:38:19 +00:00
parent 2f609096e4
commit 73aca695ac
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/i386/isa/if_le.c
View File

@ -10,7 +10,7 @@
* of this software, nor does the author assume any responsibility * of this software, nor does the author assume any responsibility
* for damages incurred with its use. * for damages incurred with its use.
* *
* $Id: if_le.c,v 1.4 1994/07/01 21:34:40 mycroft Exp $ * $Id: if_le.c,v 1.5 1994/07/01 21:38:19 mycroft Exp $
*/ */
#include "bpfilter.h" #include "bpfilter.h"
@ -707,7 +707,7 @@ leintr(sc)
if (isr & MERR) { if (isr & MERR) {
printf("%s: MERR\n", sc->sc_dev.dv_xname); printf("%s: MERR\n", sc->sc_dev.dv_xname);
le_reset(sc); le_reset(sc);
return 1; goto out;
} }
} }
@ -715,13 +715,13 @@ leintr(sc)
printf("%s: receiver disabled\n", sc->sc_dev.dv_xname); printf("%s: receiver disabled\n", sc->sc_dev.dv_xname);
sc->sc_arpcom.ac_if.if_ierrors++; sc->sc_arpcom.ac_if.if_ierrors++;
le_reset(sc); le_reset(sc);
return 1; goto out;
} }
if ((isr & TXON) == 0) { if ((isr & TXON) == 0) {
printf("%s: transmitter disabled\n", sc->sc_dev.dv_xname); printf("%s: transmitter disabled\n", sc->sc_dev.dv_xname);
sc->sc_arpcom.ac_if.if_oerrors++; sc->sc_arpcom.ac_if.if_oerrors++;
le_reset(sc); le_reset(sc);
return 1; goto out;
} }
if (isr & RINT) { if (isr & RINT) {
@ -743,6 +743,8 @@ leintr(sc)
printf("%s: leintr returning with isr=%04x\n", printf("%s: leintr returning with isr=%04x\n",
sc->sc_dev.dv_xname, isr); sc->sc_dev.dv_xname, isr);
#endif #endif
out:
if (sc->sc_card == DEPCA) if (sc->sc_card == DEPCA)
outb(sc->sc_iobase + DEPCA_CSR, DEPCA_CSR_NORMAL); outb(sc->sc_iobase + DEPCA_CSR, DEPCA_CSR_NORMAL);
return 1; return 1;

10
sys/dev/isa/if_le.c
View File

@ -10,7 +10,7 @@
* of this software, nor does the author assume any responsibility * of this software, nor does the author assume any responsibility
* for damages incurred with its use. * for damages incurred with its use.
* *
* $Id: if_le.c,v 1.4 1994/07/01 21:34:40 mycroft Exp $ * $Id: if_le.c,v 1.5 1994/07/01 21:38:19 mycroft Exp $
*/ */
#include "bpfilter.h" #include "bpfilter.h"
@ -707,7 +707,7 @@ leintr(sc)
if (isr & MERR) { if (isr & MERR) {
printf("%s: MERR\n", sc->sc_dev.dv_xname); printf("%s: MERR\n", sc->sc_dev.dv_xname);
le_reset(sc); le_reset(sc);
return 1; goto out;
} }
} }
@ -715,13 +715,13 @@ leintr(sc)
printf("%s: receiver disabled\n", sc->sc_dev.dv_xname); printf("%s: receiver disabled\n", sc->sc_dev.dv_xname);
sc->sc_arpcom.ac_if.if_ierrors++; sc->sc_arpcom.ac_if.if_ierrors++;
le_reset(sc); le_reset(sc);
return 1; goto out;
} }
if ((isr & TXON) == 0) { if ((isr & TXON) == 0) {
printf("%s: transmitter disabled\n", sc->sc_dev.dv_xname); printf("%s: transmitter disabled\n", sc->sc_dev.dv_xname);
sc->sc_arpcom.ac_if.if_oerrors++; sc->sc_arpcom.ac_if.if_oerrors++;
le_reset(sc); le_reset(sc);
return 1; goto out;
} }
if (isr & RINT) { if (isr & RINT) {
@ -743,6 +743,8 @@ leintr(sc)
printf("%s: leintr returning with isr=%04x\n", printf("%s: leintr returning with isr=%04x\n",
sc->sc_dev.dv_xname, isr); sc->sc_dev.dv_xname, isr);
#endif #endif
out:
if (sc->sc_card == DEPCA) if (sc->sc_card == DEPCA)
outb(sc->sc_iobase + DEPCA_CSR, DEPCA_CSR_NORMAL); outb(sc->sc_iobase + DEPCA_CSR, DEPCA_CSR_NORMAL);
return 1; return 1;