diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-17 17:15:59 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-17 17:15:59 +0000 |
| commit | d1f32b1902a26052536f15e9f446dec1dc0f0cb8 (patch) | |
| tree | 6b10644102f7b2874647d2780e4330bd7001a488 /nuttx | |
| parent | c806f47ab3d2552e20670bef078392e0dd96eb7f (diff) | |
| download | px4-nuttx-d1f32b1902a26052536f15e9f446dec1dc0f0cb8.tar.gz px4-nuttx-d1f32b1902a26052536f15e9f446dec1dc0f0cb8.tar.bz2 px4-nuttx-d1f32b1902a26052536f15e9f446dec1dc0f0cb8.zip | |
Fix reported USB MSC product/revision
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4495 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c | 16 | ||||
| -rw-r--r-- | nuttx/drivers/usbdev/usbmsc_scsi.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c b/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c index 53e1ea251..e5d5adfad 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c @@ -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; diff --git a/nuttx/drivers/usbdev/usbmsc_scsi.c b/nuttx/drivers/usbdev/usbmsc_scsi.c index a2f661906..54fc22795 100644 --- a/nuttx/drivers/usbdev/usbmsc_scsi.c +++ b/nuttx/drivers/usbdev/usbmsc_scsi.c @@ -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); } } |