Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 06:42:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor changes from review of last PR

Browse Source
This commit is contained in:
Gregory Nutt
2016-07-24 07:45:46 -06:00
parent fe678cf351
commit e895e19b9f
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/sam34/sam_udp.c
+13 -4
View File
@@ -1964,6 +1964,8 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
struct sam_ep_s *privep; struct sam_ep_s *privep;
uintptr_t regaddr; uintptr_t regaddr;
uint32_t csr; uint32_t csr;
bool bk0;
bool bk1;
DEBUGASSERT((unsigned)epno < SAM_UDP_NENDPOINTS); DEBUGASSERT((unsigned)epno < SAM_UDP_NENDPOINTS);
@@ -2052,30 +2054,35 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
* and clear RXDATABKx. * and clear RXDATABKx.
*/ */
bool bk0 = (csr & UDPEP_CSR_RXDATABK0) != 0; bk0 = (csr & UDPEP_CSR_RXDATABK0) != 0;
bool bk1 = (csr & UDPEP_CSR_RXDATABK1) != 0; bk1 = (csr & UDPEP_CSR_RXDATABK1) != 0;
/* 2. and 6. - Only read bank 0 */ /* 2. and 6. - Only read bank 0 */
if (bk0 && !bk1) if (bk0 && !bk1)
{ {
usbtrace(TRACE_INTDECODE(SAM_TRACEINTID_RXDATABK0), (uint16_t)csr); usbtrace(TRACE_INTDECODE(SAM_TRACEINTID_RXDATABK0), (uint16_t)csr);
sam_ep_bankinterrupt(priv, privep, csr, 0); sam_ep_bankinterrupt(priv, privep, csr, 0);
} }
/* 3. and 7. - Only read bank 1*/ /* 3. and 7. - Only read bank 1*/
else if (!bk0 && bk1) else if (!bk0 && bk1)
{ {
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG_USB_WARN
if (privep->lastbank == 1) if (privep->lastbank == 1)
{ {
ulldbg("Unexpected USB RX case.\n"); uwarn("WARNING: Unexpected USB RX case.\n");
} }
#endif #endif
usbtrace(TRACE_INTDECODE(SAM_TRACEINTID_RXDATABK1), (uint16_t)csr); usbtrace(TRACE_INTDECODE(SAM_TRACEINTID_RXDATABK1), (uint16_t)csr);
sam_ep_bankinterrupt(priv, privep, csr, 1); sam_ep_bankinterrupt(priv, privep, csr, 1);
} }
else if (bk0 && bk1) else if (bk0 && bk1)
{ {
/* 4. - Read bank 1, then read bank 0 */ /* 4. - Read bank 1, then read bank 0 */
if (privep->lastbank == 0) if (privep->lastbank == 0)
{ {
usbtrace(TRACE_INTDECODE(SAM_TRACEINTID_RXDATABK1), (uint16_t)csr); usbtrace(TRACE_INTDECODE(SAM_TRACEINTID_RXDATABK1), (uint16_t)csr);
@@ -2084,7 +2091,9 @@ static void sam_ep_interrupt(struct sam_usbdev_s *priv, int epno)
usbtrace(TRACE_INTDECODE(SAM_TRACEINTID_RXDATABK0), (uint16_t)csr); usbtrace(TRACE_INTDECODE(SAM_TRACEINTID_RXDATABK0), (uint16_t)csr);
sam_ep_bankinterrupt(priv, privep, csr, 0); sam_ep_bankinterrupt(priv, privep, csr, 0);
} }
/* 8. - Read bank 0, then read bank 1 */ /* 8. - Read bank 0, then read bank 1 */
else else
{ {
usbtrace(TRACE_INTDECODE(SAM_TRACEINTID_RXDATABK0), (uint16_t)csr); usbtrace(TRACE_INTDECODE(SAM_TRACEINTID_RXDATABK0), (uint16_t)csr);