Author: mav
Date: Mon Oct 26 11:23:41 2009
New Revision: 198487
URL: http://svn.freebsd.org/changeset/base/198487
Log:
Round timeout up when converting CAM milliseconds to ATA seconds.
Modified:
head/sys/dev/ata/atapi-cam.c
Modified: head/sys/dev/ata/atapi-cam.c
==============================================================================
--- head/sys/dev/ata/atapi-cam.c Mon Oct 26 11:20:14 2009
(r198486)
+++ head/sys/dev/ata/atapi-cam.c Mon Oct 26 11:23:41 2009
(r198487)
@@ -629,7 +629,7 @@ atapi_action(struct cam_sim *sim, union
request->data = buf;
request->bytecount = len;
request->transfersize = min(request->bytecount, 65534);
- request->timeout = ccb_h->timeout / 1000; /* XXX lost granularity */
+ request->timeout = (ccb_h->timeout + 999) / 1000;
request->callback = &atapi_cb;
request->flags = request_flags;
@@ -732,7 +732,7 @@ atapi_cb(struct ata_request *request)
request->data = (caddr_t)&csio->sense_data;
request->bytecount = sizeof(struct atapi_sense);
request->transfersize = min(request->bytecount, 65534);
- request->timeout = csio->ccb_h.timeout / 1000;
+ request->timeout = (csio->ccb_h.timeout + 999) / 1000;
request->retries = 2;
request->flags = ATA_R_QUIET|ATA_R_ATAPI|ATA_R_IMMEDIATE;
hcb->flags |= AUTOSENSE;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
