diff options
| author | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 2001-07-31 06:14:06 +0000 |
|---|---|---|
| committer | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 2001-07-31 06:14:06 +0000 |
| commit | 14a2cd20d08133deb909c4b5f5efc3d5230ec84b (patch) | |
| tree | 03e3ed814ca11fe1c285b938253a53af889b79b9 /sys/dev/ic | |
| parent | 7b7c3f33cbbf0a158f7555eecbdbc09f48d46008 (diff) | |
On DMA timeouts, stop busmaster PCIIDE and reset channel. Avoid reading
device registers as this may cause lock-ups on some chipsets
Clean-up in atapiscsi. Get rid of claim_irq. Instead, atapiscsi always
returns -1 (maybe) from the interrupt handler.
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/wdcvar.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h index 25cc4140ff4..fcaa870b74b 100644 --- a/sys/dev/ic/wdcvar.h +++ b/sys/dev/ic/wdcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdcvar.h,v 1.19 2001/06/25 19:31:50 csapuntz Exp $ */ +/* $OpenBSD: wdcvar.h,v 1.20 2001/07/31 06:14:05 csapuntz Exp $ */ /* $NetBSD: wdcvar.h,v 1.17 1999/04/11 20:50:29 bouyer Exp $ */ /*- @@ -68,7 +68,6 @@ struct channel_softc { /* Per channel data */ #define WDCF_ACTIVE 0x01 /* channel is active */ #define WDCF_ONESLAVE 0x02 /* slave-only channel */ #define WDCF_IRQ_WAIT 0x10 /* controller is waiting for irq */ -#define WDCF_DMA_WAIT 0x20 /* controller is waiting for DMA */ #define WDCF_VERBOSE_PROBE 0x40 /* verbose probe */ u_int8_t ch_status; /* copy of status register */ u_int8_t ch_error; /* copy of error register */ |