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

Fix to handle requests larger than maxpacket

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1076 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-10-25 14:40:01 +00:00
parent a672cb4258
commit 84acbd6ae7
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/src/dm320/dm320_usbdev.c
View File

@ -970,15 +970,18 @@ static int dm320_wrrequest(struct dm320_ep_s *privep)
* bytes to send. * bytes to send.
*/ */
privep->txnullpkt = 0;
if (bytesleft > privep->ep.maxpacket) if (bytesleft > privep->ep.maxpacket)
{ {
nbytes = privep->ep.maxpacket; nbytes = privep->ep.maxpacket;
privep->txnullpkt = 0;
} }
else else
{ {
nbytes = bytesleft; nbytes = bytesleft;
privep->txnullpkt = (bytesleft == privep->ep.maxpacket); if ((privreq->req.flags & USBDEV_REQFLAGS_NULLPKT) != 0)
{
privep->txnullpkt = (bytesleft == privep->ep.maxpacket);
}
} }
/* Send the largest number of bytes that we can in this packet */ /* Send the largest number of bytes that we can in this packet */
@ -1000,7 +1003,7 @@ static int dm320_wrrequest(struct dm320_ep_s *privep)
* then we are finished with the transfer * then we are finished with the transfer
*/ */
if (bytesleft <= 0 || !privep->txnullpkt) if (bytesleft <= 0 && !privep->txnullpkt)
{ {
usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd); usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd);
privep->txnullpkt = 0; privep->txnullpkt = 0;

9
arch/arm/src/lpc214x/lpc214x_usbdev.c
View File

@ -1062,15 +1062,18 @@ static int lpc214x_wrrequest(struct lpc214x_ep_s *privep)
* bytes to send. * bytes to send.
*/ */
privep->txnullpkt = 0;
if (bytesleft > privep->ep.maxpacket) if (bytesleft > privep->ep.maxpacket)
{ {
nbytes = privep->ep.maxpacket; nbytes = privep->ep.maxpacket;
privep->txnullpkt = 0;
} }
else else
{ {
nbytes = bytesleft; nbytes = bytesleft;
privep->txnullpkt = (bytesleft == privep->ep.maxpacket); if ((privreq->req.flags & USBDEV_REQFLAGS_NULLPKT) != 0)
{
privep->txnullpkt = (bytesleft == privep->ep.maxpacket);
}
} }
/* Send the largest number of bytes that we can in this packet */ /* Send the largest number of bytes that we can in this packet */
@ -1087,7 +1090,7 @@ static int lpc214x_wrrequest(struct lpc214x_ep_s *privep)
* then we are finished with the transfer * then we are finished with the transfer
*/ */
if (bytesleft <= 0 || !privep->txnullpkt) if (bytesleft <= 0 && !privep->txnullpkt)
{ {
usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd); usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd);
privep->txnullpkt = 0; privep->txnullpkt = 0;