Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 20:08:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix case where both RX and TX enabled

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2210 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2009-11-02 20:09:25 +00:00
parent 40040fe9fe
commit b1ea58fd14
1 changed files with 18 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32/stm32_usbdev.c
+18 -68
View File
@@ -436,7 +436,7 @@ static int stm32_rdrequest(struct stm32_usbdev_s *priv,
/* Interrupt level processing ***********************************************/ /* Interrupt level processing ***********************************************/
static int stm32_dispatchrequest(struct stm32_usbdev_s *priv); static void stm32_dispatchrequest(struct stm32_usbdev_s *priv);
static void stm32_epdone(struct stm32_usbdev_s *priv, ubyte epno); static void stm32_epdone(struct stm32_usbdev_s *priv, ubyte epno);
static void stm32_setdevaddr(struct stm32_usbdev_s *priv, ubyte value); static void stm32_setdevaddr(struct stm32_usbdev_s *priv, ubyte value);
static void stm32_ep0setup(struct stm32_usbdev_s *priv); static void stm32_ep0setup(struct stm32_usbdev_s *priv);
@@ -1400,9 +1400,9 @@ static void stm32_cancelrequests(struct stm32_ep_s *privep)
* Name: stm32_dispatchrequest * Name: stm32_dispatchrequest
****************************************************************************/ ****************************************************************************/
static int stm32_dispatchrequest(struct stm32_usbdev_s *priv) static void stm32_dispatchrequest(struct stm32_usbdev_s *priv)
{ {
int ret = OK; int ret;
usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DISPATCH), 0); usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DISPATCH), 0);
if (priv && priv->driver) if (priv && priv->driver)
@@ -1418,7 +1418,6 @@ static int stm32_dispatchrequest(struct stm32_usbdev_s *priv)
priv->devstate = DEVSTATE_STALLED; priv->devstate = DEVSTATE_STALLED;
} }
} }
return ret;
} }
/**************************************************************************** /****************************************************************************
@@ -1572,15 +1571,8 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
/* Let the class implementation handle all non-standar requests */ /* Let the class implementation handle all non-standar requests */
if (stm32_dispatchrequest(priv) == OK) stm32_dispatchrequest(priv);
{ handled = TRUE;
/* stm32_dispatchrequest will return OK if the class implementation
* handled the request and will request a stall if the class
* implementation failed to handle the request.
*/
handled = TRUE;
}
} }
/* Handle standard request. Pick off the things of interest to the /* Handle standard request. Pick off the things of interest to the
@@ -1704,15 +1696,8 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
* endpoint recipient) * endpoint recipient)
*/ */
if (stm32_dispatchrequest(priv) == OK) stm32_dispatchrequest(priv);
{ handled = TRUE;
/* stm32_dispatchrequest will return OK if the class implementation
* handled the request and will request a stall if the class
* implementation failed to handle the request.
*/
handled = TRUE;
}
} }
else else
{ {
@@ -1755,15 +1740,8 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
{ {
/* The class driver handles all recipients except recipient=endpoint */ /* The class driver handles all recipients except recipient=endpoint */
if (stm32_dispatchrequest(priv) == OK) stm32_dispatchrequest(priv);
{ handled = TRUE;
/* stm32_dispatchrequest will return OK if the class implementation
* handled the request and will request a stall if the class
* implementation failed to handle the request.
*/
handled = TRUE;
}
} }
else else
{ {
@@ -1828,15 +1806,8 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
{ {
/* The request seems valid... let the class implementation handle it */ /* The request seems valid... let the class implementation handle it */
if (stm32_dispatchrequest(priv) == OK) stm32_dispatchrequest(priv);
{ handled = TRUE;
/* stm32_dispatchrequest will return OK if the class implementation
* handled the request and will request a stall if the class
* implementation failed to handle the request.
*/
handled = TRUE;
}
} }
else else
{ {
@@ -1860,15 +1831,8 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
{ {
/* The request seems valid... let the class implementation handle it */ /* The request seems valid... let the class implementation handle it */
if (stm32_dispatchrequest(priv) == OK) stm32_dispatchrequest(priv);
{ handled = TRUE;
/* stm32_dispatchrequest will return OK if the class implementation
* handled the request and will request a stall if the class
* implementation failed to handle the request.
*/
handled = TRUE;
}
} }
else else
{ {
@@ -1892,15 +1856,8 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
{ {
/* The request seems valid... let the class implementation handle it */ /* The request seems valid... let the class implementation handle it */
if (stm32_dispatchrequest(priv) == OK) stm32_dispatchrequest(priv);
{ handled = TRUE;
/* stm32_dispatchrequest will return OK if the class implementation
* handled the request and will request a stall if the class
* implementation failed to handle the request.
*/
handled = TRUE;
}
} }
else else
{ {
@@ -1927,15 +1884,8 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
/* Let the class implementation handle the request */ /* Let the class implementation handle the request */
usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSETIF), priv->ctrl.type); usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSETIF), priv->ctrl.type);
if (stm32_dispatchrequest(priv) == OK) stm32_dispatchrequest(priv);
{ handled = TRUE;
/* stm32_dispatchrequest will return OK if the class implementation
* handled the request and will request a stall if the class
* implementation failed to handle the request.
*/
handled = TRUE;
}
} }
break; break;
@@ -1966,7 +1916,7 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
* must be sent (may be a zero length packet). * must be sent (may be a zero length packet).
* 2. The request was successfully handled by the class implementation. In * 2. The request was successfully handled by the class implementation. In
* case, the EP0 IN response has already been queued and the local variable * case, the EP0 IN response has already been queued and the local variable
* 'handled' will be set to TRUE; * 'handled' will be set to TRUE and devstate != DEVSTATE_STALLED;
* 3. An error was detected in either the above logic or by the class implementation * 3. An error was detected in either the above logic or by the class implementation
* logic. In either case, priv->state will be set DEVSTATE_STALLED * logic. In either case, priv->state will be set DEVSTATE_STALLED
* to indicate this case. * to indicate this case.