summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/dev/sdvar.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/hp300/dev/sdvar.h')
-rw-r--r--sys/arch/hp300/dev/sdvar.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/sys/arch/hp300/dev/sdvar.h b/sys/arch/hp300/dev/sdvar.h
index 13a74c6398a..e5933f53a8d 100644
--- a/sys/arch/hp300/dev/sdvar.h
+++ b/sys/arch/hp300/dev/sdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sdvar.h,v 1.3 1995/10/15 10:03:20 thorpej Exp $ */
+/* $NetBSD: sdvar.h,v 1.4 1996/01/07 22:02:21 thorpej Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -38,15 +38,10 @@
* @(#)sdvar.h 8.1 (Berkeley) 6/10/93
*/
-struct sdinfo {
- struct disklabel si_label; /* label */
- int si_bopen; /* mask of open block devs */
- int si_copen; /* mask of open char devs */
- int si_open; /* composite mask of open devs */
-};
-
struct sd_softc {
struct hp_device *sc_hd;
+ struct disk sc_dkdev;
+ char sc_xname[8];
struct devqueue sc_dq;
int sc_format_pid; /* process using "format" mode */
short sc_flags;
@@ -58,7 +53,6 @@ struct sd_softc {
u_int sc_heads; /* number of heads (tracks) */
u_int sc_cyls; /* number of cylinders */
u_int sc_wpms; /* average xfer rate in 16 bit wds/sec. */
- struct sdinfo sc_info; /* disklabel and related info */
};
/* sc_flags values */