MFC r249349

Repair camcontrol output and use CAM defined values for string sizes
freebsd · Apr 25, 2013 · 13435f0 · 13435f0
1 parent 3e01d4c
commit 13435f0
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
@@ -3352,9 +3352,14 @@ ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio)
 
 	cl = &sc->ciss_logical[bus][target];
 
-	padstr(inq->vendor, "COMPAQ", 8);
-	padstr(inq->product, ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance), 8);
-	padstr(inq->revision, ciss_name_ldrive_status(cl->cl_lstatus->status), 16);
+	padstr(inq->vendor, "COMPAQ",
+	       SID_VENDOR_SIZE);
+	padstr(inq->product,
+	       ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance),
+	       SID_PRODUCT_SIZE);
+	padstr(inq->revision,
+	       ciss_name_ldrive_status(cl->cl_lstatus->status),
+	       SID_REVISION_SIZE);
     }
 }