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

Fix reported USB MSC product/revision 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4495 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-03-17 17:15:59 +00:00
parent 13c02138e5
commit eba435cddd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c
View File

@ -1289,7 +1289,7 @@ static int pic32mx_rdcomplete(struct pic32mx_usbdev_s *priv,
bdtout = privep->bdtout;
epno = USB_EPNO(privep->ep.eplog);
ullvdbg("EP%d: len=%d xfrd=%d [%p]\n",
ullvdbg("EP%d: len=%d xfrd=%d\n",
epno, privreq->req.len, privreq->req.xfrd);
bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n",
epno, bdtout, bdtout->status, bdtout->addr);
@ -2713,11 +2713,11 @@ static int pic32mx_interrupt(int irq, void *context)
usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_RESET), usbir);
/* Reset interrupt received. Restore our initial state. NOTE: the
* hardware automatically resets the USB address, so we just need
* reset any existing configuration/transfer states.
* hardware automatically resets the USB address, so we really just
* need reset any existing configuration/transfer states.
*/
pic32mx_swreset(priv);
pic32mx_reset(priv);
priv->devstate = DEVSTATE_DEFAULT;
#ifdef CONFIG_USBOTG
@ -3554,14 +3554,14 @@ static int pic32mx_epbdtstall(struct usbdev_ep_s *ep, bool resume, bool epin)
bdt->status = (USB_BDT_UOWN | USB_BDT_BSTALL);
bdt->addr = 0;
/* Stop any queued requests. Hmmm.. is there a race condition here? */
pic32mx_rqstop(privep);
bdtdbg("EP%d BDT %s [%p] {%08x, %08x}\n",
epno, epin ? "IN" : "OUT", bdt, bdt->status, bdt->addr);
bdtdbg("EP%d BDT %s [%p] {%08x, %08x}\n",
epno, epin ? "IN" : "OUT", otherbdt, otherbdt->status, otherbdt->addr);
/* Stop any queued requests. Hmmm.. is there a race condition here? */
pic32mx_rqstop(privep);
}
return OK;

2
nuttx/drivers/usbdev/usbmsc_scsi.c
View File

@ -616,7 +616,7 @@ static inline int usbmsc_cmdinquiry(FAR struct usbmsc_dev_s *priv,
len = strlen(g_mscserialstr);
DEBUGASSERT(len <= 4);
memcpy(response->productid, g_mscserialstr, len);
memcpy(response->revision, g_mscserialstr, len);
}
}