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

Pay attention to DMA errors as reported by DMAINTR() returning -1. If this 

happens reset everything.

Re-schedule a timeout when first attempting to abort an operation.
This commit is contained in:
pk 1996-11-27 21:24:20 +00:00
parent c1274b3cff
commit 4526babc82
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/sparc/dev/esp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esp.c,v 1.61 1996/11/16 23:14:58 pk Exp $ */
/* $NetBSD: esp.c,v 1.62 1996/11/27 21:24:20 pk Exp $ */
#ifdef __sparc__
#define SPARC_DRIVER
@ -1609,7 +1609,12 @@ espintr(sc)
* change is expected.
*/
if (DMA_ISACTIVE(sc->sc_dma)) {
DMA_INTR(sc->sc_dma);
int r = DMA_INTR(sc->sc_dma);
if (r == -1) {
printf("%s: DMA error; resetting\n",
sc->sc_dev.dv_xname);
esp_init(sc, 1);
}
/* If DMA active here, then go back to work... */
if (DMA_ISACTIVE(sc->sc_dma))
return 1;
@ -2081,6 +2086,8 @@ esp_abort(sc, ecb)
*/
if (sc->sc_state == ESP_CONNECTED)
esp_sched_msgout(SEND_ABORT);
/* Reschedule timeout */
timeout(esp_timeout, ecb, (ecb->timeout * hz) / 1000);
} else {
esp_dequeue(sc, ecb);
TAILQ_INSERT_HEAD(&sc->ready_list, ecb, chain);