diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-05-08 17:33:58 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-05-08 17:33:58 +0000 |
| commit | ddd48b5f2421f22f246e7121fe87c61b69fc3582 (patch) | |
| tree | 16aeb2cdf59ecd63d590780d775b5c0d23e48aa1 /sys/dev/ic | |
| parent | fc1f580c371070a6c6135ae0f08ac31e178e5d3a (diff) | |
Eliminate a few unused wdc capability flags (WDC_CAPABILITY_HWLOCK,
WDC_CAPABILITY_ATA_NOSTREAM, and WDC_CAPABILITY_ATAPI_NOSTREAM).
ok dlg@, jsg@, krw@
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/wdc.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/wdcvar.h | 9 |
2 files changed, 2 insertions, 15 deletions
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c index 2900586cd81..f17a9903963 100644 --- a/sys/dev/ic/wdc.c +++ b/sys/dev/ic/wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc.c,v 1.113 2011/04/18 04:16:13 deraadt Exp $ */ +/* $OpenBSD: wdc.c,v 1.114 2011/05/08 17:33:56 matthew Exp $ */ /* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -861,9 +861,6 @@ wdcstart(struct channel_softc *chp) if ((chp->ch_flags & WDCF_IRQ_WAIT) != 0) panic("wdcstart: channel waiting for irq"); #endif /* DIAGNOSTIC */ - if (chp->wdc->cap & WDC_CAPABILITY_HWLOCK) - if (!(chp->wdc->claim_hw)(chp, 0)) - return; WDCDEBUG_PRINT(("wdcstart: xfer %p channel %d drive %d\n", xfer, chp->channel, xfer->drive), DEBUG_XFERS); @@ -1919,7 +1916,6 @@ wdc_get_xfer(int flags) void wdc_free_xfer(struct channel_softc *chp, struct wdc_xfer *xfer) { - struct wdc_softc *wdc = chp->wdc; int s; if (xfer->c_flags & C_PRIVATEXFER) { @@ -1928,8 +1924,6 @@ wdc_free_xfer(struct channel_softc *chp, struct wdc_xfer *xfer) return; } - if (wdc->cap & WDC_CAPABILITY_HWLOCK) - (*wdc->free_hw)(chp); s = splbio(); chp->ch_flags &= ~WDCF_ACTIVE; TAILQ_REMOVE(&chp->ch_queue->sc_xfer, xfer, c_xferchain); diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h index 80247362390..ea7b16f292b 100644 --- a/sys/dev/ic/wdcvar.h +++ b/sys/dev/ic/wdcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdcvar.h,v 1.49 2011/04/18 04:16:14 deraadt Exp $ */ +/* $OpenBSD: wdcvar.h,v 1.50 2011/05/08 17:33:57 matthew Exp $ */ /* $NetBSD: wdcvar.h,v 1.17 1999/04/11 20:50:29 bouyer Exp $ */ /*- @@ -157,9 +157,6 @@ struct wdc_softc { /* Per controller state */ #define WDC_CAPABILITY_MODE 0x0004 /* controller knows its PIO/DMA modes */ #define WDC_CAPABILITY_DMA 0x0008 /* DMA */ #define WDC_CAPABILITY_UDMA 0x0010 /* Ultra-DMA/33 */ -#define WDC_CAPABILITY_HWLOCK 0x0020 /* Needs to lock HW */ -#define WDC_CAPABILITY_ATA_NOSTREAM 0x0040 /* Don't use stream funcs on ATA */ -#define WDC_CAPABILITY_ATAPI_NOSTREAM 0x0080 /* Don't use stream f on ATAPI */ #define WDC_CAPABILITY_NO_EXTRA_RESETS 0x0100 /* only reset once */ #define WDC_CAPABILITY_PREATA 0x0200 /* ctrl can be a pre-ata one */ #define WDC_CAPABILITY_IRQACK 0x0400 /* callback to ack interrupt */ @@ -196,10 +193,6 @@ struct wdc_softc { /* Per controller state */ #define WDC_DMAST_ERR 0x02 /* DMA error */ #define WDC_DMAST_UNDER 0x04 /* DMA underrun */ - /* if WDC_CAPABILITY_HWLOCK set in 'cap' */ - int (*claim_hw)(void *, int); - void (*free_hw)(void *); - /* if WDC_CAPABILITY_MODE set in 'cap' */ void (*set_modes)(struct channel_softc *); |