From 2813692cc2f54cac20d43ed85039329e9d71ada6 Mon Sep 17 00:00:00 2001 From: Nate Lawson Date: Sat, 14 Jun 2003 22:17:41 +0000 Subject: 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 --- sys/dev/mpt/mpt_freebsd.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'sys/dev/mpt') diff --git a/sys/dev/mpt/mpt_freebsd.c b/sys/dev/mpt/mpt_freebsd.c index 4b370b9239caa..980f115afda6d 100644 --- a/sys/dev/mpt/mpt_freebsd.c +++ b/sys/dev/mpt/mpt_freebsd.c @@ -1400,8 +1400,6 @@ mpt_action(struct cam_sim *sim, union ccb *ccb) case XPT_CALC_GEOMETRY: { struct ccb_calc_geometry *ccg; - u_int32_t secs_per_cylinder; - u_int32_t size_mb; ccg = &ccb->ccg; if (ccg->block_size == 0) { @@ -1410,17 +1408,7 @@ mpt_action(struct cam_sim *sim, union ccb *ccb) break; } - size_mb = ccg->volume_size /((1024L * 1024L) / ccg->block_size); - if (size_mb > 1024) { - 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(ccg, /*extended*/1); xpt_done(ccb); break; } -- cgit v1.3