diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-10-07 23:19:27 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-10-07 23:19:27 +0000 |
commit | 54207ca67aedfa50f8cbd8ad5a8284fcc1d23c15 (patch) | |
tree | c3444d1d204ea4c6315b64e15efc7e2125a8b3f7 /nuttx/arch | |
parent | 14d196a1ae662856a900b06bb5855bf02292a627 (diff) | |
download | px4-nuttx-54207ca67aedfa50f8cbd8ad5a8284fcc1d23c15.tar.gz px4-nuttx-54207ca67aedfa50f8cbd8ad5a8284fcc1d23c15.tar.bz2 px4-nuttx-54207ca67aedfa50f8cbd8ad5a8284fcc1d23c15.zip |
test and integration updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@998 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
-rw-r--r-- | nuttx/arch/arm/src/dm320/dm320_usbdev.c | 137 |
1 files changed, 80 insertions, 57 deletions
diff --git a/nuttx/arch/arm/src/dm320/dm320_usbdev.c b/nuttx/arch/arm/src/dm320/dm320_usbdev.c index c0c58ea1d..26801e72b 100644 --- a/nuttx/arch/arm/src/dm320/dm320_usbdev.c +++ b/nuttx/arch/arm/src/dm320/dm320_usbdev.c @@ -99,25 +99,24 @@ #define DM320_TRACEERR_ALLOCFAIL 0x0001 #define DM320_TRACEERR_ATTACHIRQREG 0x0002 -#define DM320_TRACEERR_BADREQUEST 0x0003 -#define DM320_TRACEERR_BINDFAILED 0x0004 -#define DM320_TRACEERR_COREIRQREG 0x0005 -#define DM320_TRACEERR_DRIVER 0x0006 -#define DM320_TRACEERR_DRIVERREGISTERED 0x0007 -#define DM320_TRACEERR_EPREAD 0x0008 -#define DM320_TRACEERR_EWRITE 0x0009 -#define DM320_TRACEERR_INVALIDPARMS 0x000a -#define DM320_TRACEERR_NOEP 0x000b -#define DM320_TRACEERR_NOTCONFIGURED 0x000c -#define DM320_TRACEERR_NULLPACKET 0x000d -#define DM320_TRACEERR_NULLREQUEST 0x000e -#define DM320_TRACEERR_STALLEDCLRFEATURE 0x000f -#define DM320_TRACEERR_STALLEDISPATCH 0x0010 -#define DM320_TRACEERR_STALLEDGETST 0x0011 -#define DM320_TRACEERR_STALLEDGETSTEP 0x0012 -#define DM320_TRACEERR_STALLEDGETSTRECIP 0x0013 -#define DM320_TRACEERR_STALLEDREQUEST 0x0014 -#define DM320_TRACEERR_STALLEDSETFEATURE 0x0015 +#define DM320_TRACEERR_BINDFAILED 0x0003 +#define DM320_TRACEERR_COREIRQREG 0x0004 +#define DM320_TRACEERR_DRIVER 0x0005 +#define DM320_TRACEERR_DRIVERREGISTERED 0x0006 +#define DM320_TRACEERR_EPREAD 0x0007 +#define DM320_TRACEERR_EWRITE 0x0008 +#define DM320_TRACEERR_INVALIDPARMS 0x0009 +#define DM320_TRACEERR_NOEP 0x000a +#define DM320_TRACEERR_NOTCONFIGURED 0x000b +#define DM320_TRACEERR_NULLPACKET 0x000c +#define DM320_TRACEERR_NULLREQUEST 0x000d +#define DM320_TRACEERR_STALLEDCLRFEATURE 0x000e +#define DM320_TRACEERR_STALLEDISPATCH 0x000f +#define DM320_TRACEERR_STALLEDGETST 0x0010 +#define DM320_TRACEERR_STALLEDGETSTEP 0x0011 +#define DM320_TRACEERR_STALLEDGETSTRECIP 0x0012 +#define DM320_TRACEERR_STALLEDREQUEST 0x0013 +#define DM320_TRACEERR_STALLEDSETFEATURE 0x0014 /* Trace interrupt codes */ @@ -291,6 +290,8 @@ static void dm320_rqenqueue(FAR struct dm320_ep_s *privep, FAR struct dm320_req_ static int dm320_ep0write(ubyte *buf, uint16 nbytes); static int dm320_epwrite(ubyte epphy, ubyte *buf, uint16 nbytes); static int dm320_epread(ubyte epphy, ubyte *buf, uint16 nbytes); +static inline void dm320_abortrequest(struct dm320_ep_s *privep, + struct dm320_req_s *privreq, sint16 result) static void dm320_reqcomplete(struct dm320_ep_s *privep, sint16 result); static int dm320_wrrequest(struct dm320_ep_s *privep); static int dm320_rdrequest(struct dm320_ep_s *privep); @@ -849,6 +850,29 @@ static int dm320_epread(ubyte epphy, ubyte *buf, uint16 nbytes) } /******************************************************************************* + * Name: dm320_abortrequest + * + * Description: + * Discard a request + * + *******************************************************************************/ + +static inline void dm320_abortrequest(struct dm320_ep_s *privep, + struct dm320_req_s *privreq, + sint16 result) +{ + usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_REQABORTED), (uint16)privep->epphy); + + /* Save the result in the request structure */ + + privreq->req.result = result; + + /* Callback to the request completion handler */ + + privreq->req.callback(&privep->ep, &privreq->req); +} + +/******************************************************************************* * Name: dm320_reqcomplete * * Description: @@ -1543,6 +1567,7 @@ static int dm320_ctlrinterrupt(int irq, FAR void *context) } else { + uvdbg("Pending data on OUT endpoint\n"); priv->rxpending = 1; } } @@ -1992,68 +2017,66 @@ static int dm320_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r } req->result = -EINPROGRESS; - req->xfrd = 0; + req->xfrd = 0; + flags = irqsave(); /* Check for NULL packet */ - flags = irqsave(); if (req->len == 0 && (privep->in || privep->epphy == 3)) { usbtrace(TRACE_DEVERROR(DM320_TRACEERR_NULLPACKET), 0); dm320_putreg8(dm320_getreg8(DM320_USB_PERTXCSR1) | USB_TXCSR1_TXPKTRDY, DM320_USB_PERTXCSR1); - privep->txnullpkt = 0; - dm320_rqenqueue(privep, privreq); - goto success_notransfer; + dm320_abortcomplete(privep, OK); } - /* Has everything been sent? Or are we stalled? */ + /* If we are stalled, then drop all requests on the floor */ - if (dm320_rqempty(privep) && !privep->stalled) + else if (privep->stalled) { - /* Handle zero-length transfers on EP0 */ + lpc214x_abortrequest(privep, privreq, -EBUSY); + ret = -EBUSY; + } - if (privep->epphy == 0 && req->len == 0) - { - /* Nothing to transfer -- exit success, with zero bytes transferred */ + /* Handle zero-length transfers on EP0 */ - usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd); - dm320_reqcomplete(privep, OK); - goto success_notransfer; - } + else if (privep->epphy == 0 && req->len == 0) + { + /* Nothing to transfer -- exit success, with zero bytes transferred */ - /* Handle IN requests */ + usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd); + dm320_abortcomplete(privep, OK); + } - if ((privep->in) || privep->epphy == 3) - { - ret = dm320_wrrequest(privep); - } + /* Handle IN (device-to-host) requests */ - /* Handle pending OUT requests */ + else if ((privep->in) || privep->epphy == 3) + { + /* Add the new request to the request queue for the IN endpoint */ - else if (priv->rxpending) - { - ret = dm320_rdrequest(privep); - priv->rxpending = 0; - } - else - { - usbtrace(TRACE_DEVERROR(DM320_TRACEERR_BADREQUEST), 0); - ret = ERROR; - goto errout; - } + dm320_rqenqueue(privep, privreq); + usbtrace(TRACE_INREQQUEUED(privep->epphy), privreq->req.len); + ret = dm320_wrrequest(privep); } - /* Add to endpoint's request queue */ + /* Handle OUT (host-to-device) requests */ - if (ret >= 0) + else { - usbtrace((privep->in) ? TRACE_INREQQUEUED(privep->epphy) : TRACE_OUTREQQUEUED(privep->epphy), - privreq->req.len); + /* Add the new request to the request queue for the OUT endpoint */ + + privep->txnullpkt = 0; dm320_rqenqueue(privep, privreq); + usbtrace(TRACE_OUTREQQUEUED(privep->epphy), privreq->req.len); + + /* This there a incoming data pending the availability of a request? */ + + if (priv->rxpending) + { + ret = dm320_rdrequest(privep); + priv->rxpending = 0; + } } -success_notransfer: -errout: irqrestore(flags); return ret; } |