diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-22 00:40:03 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-22 00:40:03 +0000 |
| commit | 22c9c3850c0937b005b1a8552095891e59df87c2 (patch) | |
| tree | e3633a0c9690c06d26a567eb2f2c6e937c26db61 /sys/arch/hp300 | |
| parent | 2122cf052cb864c6d41447b67783028f0ee3a145 (diff) | |
b_cylin -> b_cylinder; no functional change.
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/dev/hd.c | 8 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/disksubr.c | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c index 24a13b51616..2a083eab0fb 100644 --- a/sys/arch/hp300/dev/hd.c +++ b/sys/arch/hp300/dev/hd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd.c,v 1.38 2006/01/20 23:27:25 miod Exp $ */ +/* $OpenBSD: hd.c,v 1.39 2006/01/22 00:40:01 miod Exp $ */ /* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */ /* @@ -72,8 +72,6 @@ #define HDPART(x) DISKPART(x) #define HDLABELDEV(d) MAKEDISKDEV(major(d), HDUNIT(d), RAW_PART) -#define b_cylin b_resid - #ifndef HDRETRY #define HDRETRY 5 #endif @@ -690,7 +688,7 @@ hdstrategy(bp) goto bad; } } - bp->b_cylin = bn + offset; + bp->b_cylinder = bn + offset; s = splbio(); disksort(dp, bp); if (dp->b_active == 0) { @@ -780,7 +778,7 @@ again: rs->sc_ioc.c_volume = C_SVOL(0); rs->sc_ioc.c_saddr = C_SADDR; rs->sc_ioc.c_hiaddr = 0; - rs->sc_ioc.c_addr = HDBTOS(bp->b_cylin); + rs->sc_ioc.c_addr = HDBTOS(bp->b_cylinder); rs->sc_ioc.c_nop2 = C_NOP; rs->sc_ioc.c_slen = C_SLEN; rs->sc_ioc.c_len = rs->sc_resid; diff --git a/sys/arch/hp300/hp300/disksubr.c b/sys/arch/hp300/hp300/disksubr.c index 0d631bbccc2..aefbeeede50 100644 --- a/sys/arch/hp300/hp300/disksubr.c +++ b/sys/arch/hp300/hp300/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.17 2005/03/30 07:52:31 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.18 2006/01/22 00:40:01 miod Exp $ */ /* $NetBSD: disksubr.c,v 1.9 1997/04/01 03:12:13 scottr Exp $ */ /* @@ -44,8 +44,6 @@ #include <sys/disklabel.h> #include <sys/syslog.h> -#define b_cylinder b_resid - void dk_establish(dk, dev) struct disk *dk; |