diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-23 11:47:23 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-23 11:47:23 +0000 |
| commit | aa059f11062a2b1212b0f332778781f2e673fd0b (patch) | |
| tree | 291dcd4ce92b7767e0a17a3a60c3be3bce4e7773 /sys/arch/hp300/dev/sd.c | |
| parent | cb993b71672e8d5d7a680fe314f872b0f18c42b2 (diff) | |
sync to 0622
Diffstat (limited to 'sys/arch/hp300/dev/sd.c')
| -rw-r--r-- | sys/arch/hp300/dev/sd.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c index 6260683c6be..75121b1b6dc 100644 --- a/sys/arch/hp300/dev/sd.c +++ b/sys/arch/hp300/dev/sd.c @@ -1,4 +1,4 @@ -/* $NetBSD: sd.c,v 1.22 1996/02/14 02:45:05 thorpej Exp $ */ +/* $NetBSD: sd.c,v 1.22.4.1 1996/06/06 16:22:04 thorpej Exp $ */ /* * Copyright (c) 1990, 1993 @@ -48,7 +48,6 @@ #include <sys/systm.h> #include <sys/buf.h> #include <sys/stat.h> -#include <sys/dkstat.h> /* XXX */ #include <sys/disklabel.h> #include <sys/disk.h> #include <sys/malloc.h> @@ -313,7 +312,6 @@ sdident(sc, hd, verbose) printf("drive empty\n"); } - sc->sc_wpms = 32 * (60 * DEV_BSIZE / 2); /* XXX */ scsi_delay(0); return(inqbuf.type); failed: @@ -606,10 +604,6 @@ sdopen(dev, flags, mode, p) return(error); } - /* XXX Support old-style instrumentation for now. */ - if (sc->sc_hd->hp_dk >= 0) - dk_wpms[sc->sc_hd->hp_dk] = sc->sc_wpms; - mask = 1 << sdpart(dev); if (mode == S_IFCHR) sc->sc_dkdev.dk_copenmask |= mask; @@ -999,14 +993,6 @@ sdgo(unit) #endif if (scsigo(hp->hp_ctlr, hp->hp_slave, sc->sc_punit, bp, cmd, pad) == 0) { - /* XXX Support old-style instrumentation for now. */ - if (hp->hp_dk >= 0) { - dk_busy |= 1 << hp->hp_dk; - ++dk_seek[hp->hp_dk]; - ++dk_xfer[hp->hp_dk]; - dk_wds[hp->hp_dk] += bp->b_bcount >> 6; - } - /* Instrumentation. */ disk_busy(&sc->sc_dkdev); sc->sc_dkdev.dk_seek++; /* XXX */ @@ -1041,10 +1027,6 @@ sdintr(arg, stat) return; } - /* XXX Support old-style instrumentation for now. */ - if (hp->hp_dk >= 0) - dk_busy &=~ (1 << hp->hp_dk); - disk_unbusy(&sc->sc_dkdev, (bp->b_bcount - bp->b_resid)); if (stat) { |