From 785f473a3381f90515863d20665b9b02ef0b0338 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 4 Apr 2010 16:33:37 +0000 Subject: Driver fixes from David Hewson git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2572 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'nuttx/arch/arm/src/lpc313x') diff --git a/nuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c b/nuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c index 30e007e95..9d6820848 100755 --- a/nuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c +++ b/nuttx/arch/arm/src/lpc313x/lpc313x_usbdev.c @@ -1623,14 +1623,16 @@ lpc313x_epcomplete(struct lpc313x_usbdev_s *priv, uint8_t epphy) if (LPC313X_EPPHYOUT(privep->epphy)) { /* read(OUT) completes when request filled, or a short transfer is received */ + complete = (privreq->req.xfrd >= privreq->req.len || xfrd < privep->ep.maxpacket); usbtrace(TRACE_INTDECODE(LPC313X_TRACEINTID_EPIN), complete); } else { - // write(IN) completes when request finished, unless we need to terminate with a ZLP - bool need_zlp = xfrd == privep->ep.maxpacket && ((privreq->req.flags & USBDEV_REQFLAGS_NULLPKT) != 0); + /* write(IN) completes when request finished, unless we need to terminate with a ZLP */ + + bool need_zlp = (xfrd == privep->ep.maxpacket) && ((privreq->req.flags & USBDEV_REQFLAGS_NULLPKT) != 0); complete = (privreq->req.xfrd >= privreq->req.len && !need_zlp); @@ -2121,22 +2123,23 @@ static int lpc313x_epstall(FAR struct usbdev_ep_s *ep, bool resume) flags = irqsave(); usbtrace(resume ? TRACE_EPRESUME : TRACE_EPSTALL, privep->epphy); - uint32_t addr = LPC313X_USBDEV_ENDPTCTRL(privep->epphy); - uint32_t mask = LPC313X_EPPHYIN(privep->epphy) ? USBDEV_ENDPTCTRL_TXS : USBDEV_ENDPTCTRL_RXS; + uint32_t addr = LPC313X_USBDEV_ENDPTCTRL(privep->epphy); + uint32_t ctrl_xs = LPC313X_EPPHYIN(privep->epphy) ? USBDEV_ENDPTCTRL_TXS : USBDEV_ENDPTCTRL_RXS; + uint32_t ctrl_xr = LPC313X_EPPHYIN(privep->epphy) ? USBDEV_ENDPTCTRL_TXR : USBDEV_ENDPTCTRL_RXR; if (resume) { privep->stalled = false; - lpc313x_clrbits (mask, addr); + /* Clear stall and reset the data toggle */ - /* FIXME: do we need to restart any queued write requests? */ + lpc313x_chgbits (ctrl_xs | ctrl_xr, ctrl_xr, addr); } else { privep->stalled = true; - lpc313x_setbits (mask, addr); + lpc313x_setbits (ctrl_xs, addr); } irqrestore(flags); -- cgit v1.2.3