sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Status not being set when transfer started via epsubmit()

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2217 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-11-03 16:11:55 +00:00
parent f57ba50c9b
commit f1de52049b
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
arch/arm/src/stm32/stm32_usbdev.c
View File

@ -72,19 +72,6 @@
# define CONFIG_USBDEV_EP0_MAXSIZE 64 # define CONFIG_USBDEV_EP0_MAXSIZE 64
#endif #endif
#ifndef CONFIG_USBDEV_MAXPOWER
# define CONFIG_USBDEV_MAXPOWER 100 /* mA */
#endif
#define USB_SLOW_INT USBDEV_DEVINT_EPSLOW
#define USB_DEVSTATUS_INT USBDEV_DEVINT_DEVSTAT
#ifdef CONFIG_STM32_USBDEV_EPFAST_INTERRUPT
# define USB_FAST_INT USBDEV_DEVINT_EPFAST
#else
# define USB_FAST_INT 0
#endif
#ifndef CONFIG_USB_PRI #ifndef CONFIG_USB_PRI
# define CONFIG_USB_PRI NVIC_SYSH_PRIORITY_DEFAULT # define CONFIG_USB_PRI NVIC_SYSH_PRIORITY_DEFAULT
#endif #endif
@ -1479,10 +1466,10 @@ static void stm32_epdone(struct stm32_usbdev_s *priv, ubyte epno)
/* Handle write requests */ /* Handle write requests */
priv->rxstatus = USB_EPR_STATRX_NAK; priv->txstatus = USB_EPR_STATTX_NAK;
stm32_wrrequest(priv, privep); stm32_wrrequest(priv, privep);
/* Set the new RX status */ /* Set the new TX status */
stm32_seteptxstatus(epno, priv->txstatus); stm32_seteptxstatus(epno, priv->txstatus);
} }
@ -1529,7 +1516,9 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
int nbytes = 0; /* Assume zero-length packet */ int nbytes = 0; /* Assume zero-length packet */
int ret; int ret;
/* Terminate any pending requests */ /* Terminate any pending requests (doesn't work if the pending request
* was a zero-length transfer!)
*/
while (!stm32_rqempty(ep0)) while (!stm32_rqempty(ep0))
{ {
@ -1960,7 +1949,7 @@ static void stm32_ep0in(struct stm32_usbdev_s *priv)
if (priv->devstate == DEVSTATE_WRREQUEST) if (priv->devstate == DEVSTATE_WRREQUEST)
{ {
stm32_wrrequest(priv, &priv->eplist[EP0]); stm32_wrrequest(priv, &priv->eplist[EP0]);
} }
/* No.. Are we processing the completion of a status response? */ /* No.. Are we processing the completion of a status response? */
@ -2643,9 +2632,7 @@ static int stm32_epconfigure(struct usbdev_ep_s *ep,
if (USB_ISEPIN(desc->addr)) if (USB_ISEPIN(desc->addr))
{ {
/* The full, logical EP number includes direction (which is zero /* The full, logical EP number includes direction */
* for IN endpoints.
*/
ep->eplog = USB_EPIN(epno); ep->eplog = USB_EPIN(epno);
@ -2768,6 +2755,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
struct stm32_ep_s *privep = (struct stm32_ep_s *)ep; struct stm32_ep_s *privep = (struct stm32_ep_s *)ep;
struct stm32_usbdev_s *priv; struct stm32_usbdev_s *priv;
irqstate_t flags; irqstate_t flags;
ubyte epno;
int ret = OK; int ret = OK;
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG
@ -2793,6 +2781,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
/* Handle the request from the class driver */ /* Handle the request from the class driver */
epno = USB_EPNO(ep->eplog);
req->result = -EINPROGRESS; req->result = -EINPROGRESS;
req->xfrd = 0; req->xfrd = 0;
flags = irqsave(); flags = irqsave();
@ -2811,18 +2800,23 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
* IN functionality. * IN functionality.
*/ */
else if (USB_ISEPIN(ep->eplog) || USB_EPNO(ep->eplog) == EP0) else if (USB_ISEPIN(ep->eplog) || epno == EP0)
{ {
/* Add the new request to the request queue for the IN endpoint */ /* Add the new request to the request queue for the IN endpoint */
stm32_rqenqueue(privep, privreq); stm32_rqenqueue(privep, privreq);
usbtrace(TRACE_INREQQUEUED(USB_EPNO(ep->eplog)), req->len); usbtrace(TRACE_INREQQUEUED(epno), req->len);
/* If the IN endpoint FIFO is available, then transfer the data now */ /* If the IN endpoint FIFO is available, then transfer the data now */
if (!privep->txbusy) if (!privep->txbusy)
{ {
ret = stm32_wrrequest(priv, privep); priv->txstatus = USB_EPR_STATTX_NAK;
ret = stm32_wrrequest(priv, privep);
/* Set the new TX status */
stm32_seteptxstatus(epno, priv->txstatus);
} }
} }
@ -2834,14 +2828,19 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
privep->txnullpkt = 0; privep->txnullpkt = 0;
stm32_rqenqueue(privep, privreq); stm32_rqenqueue(privep, privreq);
usbtrace(TRACE_OUTREQQUEUED(USB_EPNO(ep->eplog)), req->len); usbtrace(TRACE_OUTREQQUEUED(epno), req->len);
/* This there a incoming data pending the availability of a request? */ /* This there a incoming data pending the availability of a request? */
if (priv->rxpending) if (priv->rxpending)
{ {
ret = stm32_rdrequest(priv, privep); priv->rxstatus = USB_EPR_STATRX_VALID;
ret = stm32_rdrequest(priv, privep);
priv->rxpending = 0; priv->rxpending = 0;
/* Set the new RX status */
stm32_seteprxstatus(epno, priv->rxstatus);
} }
} }