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

1 files changed, 1 insertions, 16 deletions

diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c
index d30c964..400a87e 100644
--- a/sys/dev/amr/amr_cam.c
+++ b/sys/dev/amr/amr_cam.c
@@ -265,22 +265,7 @@ amr_cam_action(struct cam_sim *sim, union ccb *ccb)
 
     case XPT_CALC_GEOMETRY:
     {
-	struct    ccb_calc_geometry *ccg = &ccb->ccg;
-	u_int32_t size_in_mb;
-	u_int32_t secs_per_cylinder;
-
-	size_in_mb = ccg->volume_size / ((1024L * 1024L) / ccg->block_size);
-
-	if (size_in_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(&ccb->ccg, /*extended*/1);
 	break;
     }