summaryrefslogtreecommitdiffstats
path: root/sys/dev/aic
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2003-06-14 22:17:41 +0000
committernjl <njl@FreeBSD.org>2003-06-14 22:17:41 +0000
commitea1ca84312e2a8d2a9c99abe3678a2f10ea13fab (patch)
tree366938aa2e5b41ac39ddf11517f3ef5a83c02a20 /sys/dev/aic
parentb184633199beba93ad13f46cf12a67fbaa20ad06 (diff)
downloadFreeBSD-src-ea1ca84312e2a8d2a9c99abe3678a2f10ea13fab.zip
FreeBSD-src-ea1ca84312e2a8d2a9c99abe3678a2f10ea13fab.tar.gz
Merge common XPT_CALC_GEOMETRY functions into a single convenience function.
Devices below may experience a change in geometry. * Due to a bug, aic(4) never used extended geometry. Changes all drives >1G to now use extended translation. * sbp(4) drives exactly 1 GB in size now no longer use extended geometry. * umass(4) drives exactly 1 GB in size now no longer use extended geometry. For all other controllers in this commit, this should be a no-op. Looked over by: scottl
Diffstat (limited to 'sys/dev/aic')
-rw-r--r--sys/dev/aic/aic.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index 355968e..7824df1 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -254,25 +254,7 @@ aic_action(struct cam_sim *sim, union ccb *ccb)
}
case XPT_CALC_GEOMETRY:
{
- struct ccb_calc_geometry *ccg;
- u_int32_t size_mb;
- u_int32_t secs_per_cylinder;
- int extended = 0;
-
- ccg = &ccb->ccg;
- size_mb = ccg->volume_size
- / ((1024L * 1024L) / ccg->block_size);
-
- if (size_mb >= 1024 && extended) {
- ccg->heads = 255;
- ccg->secs_per_track = 63;
- } else {
- ccg->heads = 64;
- ccg->secs_per_track = 32;
- }
- secs_per_cylinder = ccg->heads * ccg->secs_per_track;
- ccg->cylinders = ccg->volume_size / secs_per_cylinder;
- ccb->ccb_h.status = CAM_REQ_CMP;
+ cam_calc_geometry(&ccb->ccg, /*extended*/1);
xpt_done(ccb);
break;
}
OpenPOWER on IntegriCloud