diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-10-27 16:39:15 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-10-27 16:39:15 +0000 |
| commit | e45c64051366a3ca07d269452e02fa153831c251 (patch) | |
| tree | 3db31cde3d7c77557812c498dbb0ee87e5222599 /nuttx/arch/arm/src/dm320/dm320_usbdev.c | |
| parent | a7646a784994ee75435b1cc8e3f20a40d14175a0 (diff) | |
| download | px4-nuttx-e45c64051366a3ca07d269452e02fa153831c251.tar.gz px4-nuttx-e45c64051366a3ca07d269452e02fa153831c251.tar.bz2 px4-nuttx-e45c64051366a3ca07d269452e02fa153831c251.zip | |
Correct error in end-of-request handling
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1082 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/dm320/dm320_usbdev.c')
| -rw-r--r-- | nuttx/arch/arm/src/dm320/dm320_usbdev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/dm320/dm320_usbdev.c b/nuttx/arch/arm/src/dm320/dm320_usbdev.c index 46cbb654a..c585c3fe9 100644 --- a/nuttx/arch/arm/src/dm320/dm320_usbdev.c +++ b/nuttx/arch/arm/src/dm320/dm320_usbdev.c @@ -886,7 +886,7 @@ static void dm320_reqcomplete(struct dm320_ep_s *privep, sint16 result) int stalled = privep->stalled; irqstate_t flags; - /* Remove the complete request at the head of the endpoint request list */ + /* Remove the completed request at the head of the endpoint request list */ flags = irqsave(); privreq = dm320_rqdequeue(privep); @@ -1003,7 +1003,7 @@ static int dm320_wrrequest(struct dm320_ep_s *privep) * then we are finished with the transfer */ - if (bytesleft <= 0 && !privep->txnullpkt) + if (privreq->req.xfrd >= privreq->req.len && !privep->txnullpkt) { usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd); privep->txnullpkt = 0; @@ -1214,8 +1214,8 @@ static inline void dm320_ep0setup(struct dm320_usbdev_s *priv) value = GETUINT16(ctrl.value); len = GETUINT16(ctrl.len); - uvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", - ctrl.type, ctrl.req, value, index, len); + ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ctrl.type, ctrl.req, value, index, len); /* Dispatch any non-standard requests */ @@ -1575,7 +1575,7 @@ static int dm320_ctlrinterrupt(int irq, FAR void *context) } else { - uvdbg("Pending data on OUT endpoint\n"); + ullvdbg("Pending data on OUT endpoint\n"); priv->rxpending = 1; } } @@ -2357,7 +2357,7 @@ void up_usbinitialize(void) #ifdef CONFIG_DEBUG_USB chiprev = dm320_getreg16(DM320_BUSC_REVR); - udbg("DM320 revision : %d.%d\n", chiprev >> 4, chiprev & 0x0f); + ulldbg("DM320 revision : %d.%d\n", chiprev >> 4, chiprev & 0x0f); #endif /* Enable USB clock & GIO clock */ |