eenurkka commented on code in PR #6601:
URL: https://github.com/apache/incubator-nuttx/pull/6601#discussion_r918790457
##########
drivers/usbdev/usbmsc_scsi.c:
##########
@@ -2454,9 +2470,34 @@ static int usbmsc_cmdwritestate(FAR struct usbmsc_dev_s
*priv)
priv->nsectbytes += nbytes;
priv->nreqbytes -= nbytes;
+#ifdef CONFIG_USBMSC_WRMULTIPLE
+ uint32_t nrbufs = MIN(priv->u.xfrlen, CONFIG_USBMSC_NWRREQS);
+
/* Is the I/O buffer full? */
- if (priv->nsectbytes >= lun->sectorsize)
+ if ((priv->nsectbytes >= lun->sectorsize * priv->u.xfrlen) ||
+ (priv->nsectbytes >= lun->sectorsize * CONFIG_USBMSC_NWRREQS))
+ {
+ /* Yes.. Write next sectors */
+
+ nwritten = USBMSC_DRVR_WRITE(lun, priv->iobuffer,
+ priv->sector, nrbufs);
+ if (nwritten < 0)
+ {
+ usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_CMDWRITEWRITEFAIL),
+ -nwritten);
+ lun->sd = SCSI_KCQME_WRITEFAULTAUTOREALLOCFAILED;
+ lun->sdinfo = priv->sector;
+ goto errout;
+ }
+
+ priv->nsectbytes = 0;
+ priv->residue -= lun->sectorsize * nrbufs;
+ priv->u.xfrlen -= nrbufs;
+ priv->sector += nrbufs;
+ }
Review Comment:
Ok, I understand it now. But if there's such an else, then if
((priv->nsectbytes >= lun->sectorsize)) would always be taken in preference to
the previous if, and this would always send single blocks? Usually with
dualspeed usb we receive 512-byte blocks (usb bulk), and with the else, it
would always send single blocks.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
