phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Add bugfixes recommended by Sheref Younan 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3737 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2011-07-01 13:46:34 +00:00
parent 568f8f0eb1
commit 489db6762a
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nuttx/ChangeLog
View File

@ -1833,5 +1833,11 @@
* drivers/mtd/ramtron.c, net/net_checksd.c, fs/fs_fdopen.c, and include/nuttx/mii.h:
Several structural changes made to get a clean compile under the ez80 ZDS-II
toolchain (no design changes).
toolchain (no design changes).
* drivers/usbhost/usbhost_storage.c: Incorpated bugfixes reported by Sheref H.
Younan: (1) Read capacity logic read largest block, not the number of blocks
and was, therefore, off by one, and (2) Some devices stall of get Max LUN request
if they support only a single LUN. Logic now assumes a single LUN if the get
Max LUN request fails.

15
nuttx/drivers/usbhost/usbhost_storage.c
View File

@ -669,6 +669,7 @@ static inline int usbhost_maxlunreq(FAR struct usbhost_state_s *priv)
{
FAR struct usb_ctrlreq_s *req = (FAR struct usb_ctrlreq_s *)priv->tbuffer;
DEBUGASSERT(priv && priv->tbuffer);
int ret;
/* Request maximum logical unit number. NOTE: On an IN transaction, The
* req and buffer pointers passed to DRVR_CTRLIN may refer to the same
@ -680,7 +681,17 @@ static inline int usbhost_maxlunreq(FAR struct usbhost_state_s *priv)
req->type = USB_DIR_IN|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE;
req->req = USBSTRG_REQ_GETMAXLUN;
usbhost_putle16(req->len, 1);
return DRVR_CTRLIN(priv->drvr, req, priv->tbuffer);
ret = DRVR_CTRLIN(priv->drvr, req, priv->tbuffer);
if (ret != OK)
{
/* Devices that do not support multiple LUNs may stall this command.
* On a failure, a single LUN is assumed.
*/
*(priv->tbuffer) = 0;
}
return OK;
}
static inline int usbhost_testunitready(FAR struct usbhost_state_s *priv)
@ -788,7 +799,7 @@ static inline int usbhost_readcapacity(FAR struct usbhost_state_s *priv)
/* Save the capacity information */
resp = (FAR struct scsiresp_readcapacity10_s *)priv->tbuffer;
priv->nblocks = usbhost_getbe32(resp->lba);
priv->nblocks = usbhost_getbe32(resp->lba) + 1;
priv->blocksize = usbhost_getbe32(resp->blklen);
/* Receive the CSW */