diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-06-04 21:57:57 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-06-04 21:57:57 +0000 |
| commit | e8115f3fe1cab872b5aff0873228cb5f9f5f2a36 (patch) | |
| tree | f581546d02fa2172ba87c1210e6b5c23a5e4106d /sys/arch/mvme68k | |
| parent | 0786dec7ceab5a48412cd96e477146234d47d738 (diff) | |
More fallback from struct disklabel changes, yawn
Diffstat (limited to 'sys/arch/mvme68k')
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/disksubr.c | 44 | ||||
| -rw-r--r-- | sys/arch/mvme68k/stand/libsa/bugdev.c | 27 |
2 files changed, 6 insertions, 65 deletions
diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c index 52dc3c1f520..bb66ddd730e 100644 --- a/sys/arch/mvme68k/mvme68k/disksubr.c +++ b/sys/arch/mvme68k/mvme68k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.63 2008/06/12 06:58:36 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.64 2009/06/04 21:57:56 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. @@ -165,22 +165,10 @@ bsdtocpulabel(struct disklabel *lp, struct mvmedisklabel *clp) clp->rpm = lp->d_rpm; clp->cfg_ilv = lp->d_interleave; - clp->cfg_sof = lp->d_trackskew; - clp->cylskew = lp->d_cylskew; - clp->headswitch = lp->d_headswitch; - - /* this silly table is for winchester drives */ - if (lp->d_trkseek < 6) - clp->cfg_ssr = 0; - else if (lp->d_trkseek < 10) - clp->cfg_ssr = 1; - else if (lp->d_trkseek < 15) - clp->cfg_ssr = 2; - else if (lp->d_trkseek < 20) - clp->cfg_ssr = 3; - else - clp->cfg_ssr = 4; - + clp->cfg_sof = 1; + clp->cylskew = 1; + clp->headswitch = 0; + clp->cfg_ssr = 0; clp->flags = lp->d_flags; for (i = 0; i < NDDATA; i++) clp->drivedata[i] = lp->d_drivedata[i]; @@ -229,28 +217,6 @@ cputobsdlabel(struct disklabel *lp, struct mvmedisklabel *clp) lp->d_acylinders = clp->acylinders; lp->d_rpm = clp->rpm; lp->d_interleave = clp->cfg_ilv; - lp->d_trackskew = clp->cfg_sof; - lp->d_cylskew = clp->cylskew; - lp->d_headswitch = clp->headswitch; - - /* this silly table is for winchester drives */ - switch (clp->cfg_ssr) { - case 1: - lp->d_trkseek = 6; - break; - case 2: - lp->d_trkseek = 10; - break; - case 3: - lp->d_trkseek = 15; - break; - case 4: - lp->d_trkseek = 20; - break; - default: - lp->d_trkseek = 0; - } - lp->d_flags = clp->flags; for (i = 0; i < NDDATA; i++) lp->d_drivedata[i] = clp->drivedata[i]; diff --git a/sys/arch/mvme68k/stand/libsa/bugdev.c b/sys/arch/mvme68k/stand/libsa/bugdev.c index aa9aaec8d17..a17616a4608 100644 --- a/sys/arch/mvme68k/stand/libsa/bugdev.c +++ b/sys/arch/mvme68k/stand/libsa/bugdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugdev.c,v 1.4 2007/06/17 00:28:56 deraadt Exp $ */ +/* $OpenBSD: bugdev.c,v 1.5 2009/06/04 21:57:56 miod Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -183,31 +183,6 @@ cputobsdlabel(struct disklabel *lp, struct mvmedisklabel *clp) lp->d_acylinders = clp->acylinders; lp->d_rpm = clp->rpm; lp->d_interleave = clp->cfg_ilv; - lp->d_trackskew = clp->cfg_sof; - lp->d_cylskew = clp->cylskew; - lp->d_headswitch = clp->headswitch; - - /* this silly table is for winchester drives */ - switch (clp->cfg_ssr) { - case 0: - lp->d_trkseek = 0; - break; - case 1: - lp->d_trkseek = 6; - break; - case 2: - lp->d_trkseek = 10; - break; - case 3: - lp->d_trkseek = 15; - break; - case 4: - lp->d_trkseek = 20; - break; - default: - lp->d_trkseek = 0; - break; - } lp->d_flags = clp->flags; for (i = 0; i < NDDATA; i++) lp->d_drivedata[i] = clp->drivedata[i]; |