diff options
| author | oster <oster@NetBSD.org> | 1999-12-07 02:40:27 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 1999-12-07 02:40:27 +0000 |
| commit | e65f9b7c873d1e3e5c22100eea4036caee4bb9d6 (patch) | |
| tree | 1d722608e697bf00f278c72e8931b3280c947027 /sys/dev/raidframe | |
| parent | a38b721e5fdd83a8dbdf0acf9a1102b2a4b98405 (diff) | |
More cleanup. DKUSAGE (what little was left of it) goes bye-bye.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_driver.c | 21 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_general.h | 15 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_states.c | 16 |
3 files changed, 3 insertions, 49 deletions
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index 61e711ce90a..962f12754b2 100644 --- a/sys/dev/raidframe/rf_driver.c +++ b/sys/dev/raidframe/rf_driver.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_driver.c,v 1.17 1999/12/07 02:13:28 oster Exp $ */ +/* $NetBSD: rf_driver.c,v 1.18 1999/12/07 02:40:27 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -119,14 +119,6 @@ #include <sys/buf.h> -#if DKUSAGE > 0 -#include <sys/dkusage.h> -#include <io/common/iotypes.h> -#include <io/cam/dec_cam.h> -#include <io/cam/cam.h> -#include <io/cam/pdrv.h> -#endif /* DKUSAGE > 0 */ - /* rad == RF_RaidAccessDesc_t */ static RF_FreeList_t *rf_rad_freelist; #define RF_MAX_FREE_RAD 128 @@ -163,23 +155,12 @@ RF_DECLARE_GLOBAL_THREADID /* declarations for threadid.h */ #define WAIT_FOR_QUIESCENCE(_raid_) \ tsleep(&((_raid_)->accesses_suspended),PRIBIO,"raidframe quiesce", 0); -#if DKUSAGE > 0 -#define IO_BUF_ERR(bp, err, unit) { \ - bp->b_flags |= B_ERROR; \ - bp->b_resid = bp->b_bcount; \ - bp->b_error = err; \ - RF_DKU_END_IO(unit, bp); \ - biodone(bp); \ -} -#else #define IO_BUF_ERR(bp, err, unit) { \ bp->b_flags |= B_ERROR; \ bp->b_resid = bp->b_bcount; \ bp->b_error = err; \ - RF_DKU_END_IO(unit); \ biodone(bp); \ } -#endif /* DKUSAGE > 0 */ static int configureCount = 0; /* number of active configurations */ static int isconfigged = 0; /* is basic raidframe (non per-array) diff --git a/sys/dev/raidframe/rf_general.h b/sys/dev/raidframe/rf_general.h index e69bf5505b7..effaf771d67 100644 --- a/sys/dev/raidframe/rf_general.h +++ b/sys/dev/raidframe/rf_general.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_general.h,v 1.3 1999/02/05 00:06:12 oster Exp $ */ +/* $NetBSD: rf_general.h,v 1.4 1999/12/07 02:40:28 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -95,19 +95,6 @@ extern char rf_panicbuf[]; #define RF_BLIP(x) (NBPG - (RF_UL(x) & RF_PGMASK)) /* bytes left in page */ #define RF_PAGE_ALIGNED(x) ((RF_UL(x) & RF_PGMASK) == 0) -#if DKUSAGE > 0 -#define RF_DKU_END_IO(_unit_,_bp_) { \ - int s = splbio(); \ - dku_end_io(DKU_RAIDFRAME_BUS, _unit_, 0, \ - (((_bp_)->b_flags&(B_READ|B_WRITE) == B_READ) ? \ - CAM_DIR_IN : CAM_DIR_OUT), \ - (_bp_)->b_bcount); \ - splx(s); \ -} -#else /* DKUSAGE > 0 */ -#define RF_DKU_END_IO(unit) { /* noop */ } -#endif /* DKUSAGE > 0 */ - #ifdef __STDC__ #define RF_STRING(_str_) #_str_ #else /* __STDC__ */ diff --git a/sys/dev/raidframe/rf_states.c b/sys/dev/raidframe/rf_states.c index b4d4771cdb3..eb669de71e5 100644 --- a/sys/dev/raidframe/rf_states.c +++ b/sys/dev/raidframe/rf_states.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_states.c,v 1.8 1999/12/03 03:35:30 oster Exp $ */ +/* $NetBSD: rf_states.c,v 1.9 1999/12/07 02:40:28 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -43,14 +43,6 @@ #include "rf_map.h" #include "rf_etimer.h" -#if defined(KERNEL) && (DKUSAGE > 0) -#include <sys/dkusage.h> -#include <io/common/iotypes.h> -#include <io/cam/dec_cam.h> -#include <io/cam/cam.h> -#include <io/cam/pdrv.h> -#endif /* KERNEL && DKUSAGE > 0 */ - /* prototypes for some of the available states. States must: @@ -202,12 +194,6 @@ rf_State_LastState(RF_RaidAccessDesc_t * desc) RF_CBParam_t callbackArg; callbackArg.p = desc->callbackArg; - -#if DKUSAGE > 0 - RF_DKU_END_IO(((RF_Raid_t *) desc->raidPtr)->raidid, (struct buf *) desc->bp); -#else - RF_DKU_END_IO(((RF_Raid_t *) desc->raidPtr)->raidid); -#endif /* DKUSAGE > 0 */ /* * If this is not an async request, wake up the caller |
