From f873ab55b60293d6e7ff926ed7a12b4aac57d007 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 11 Apr 2012 18:12:03 +0000 Subject: [PATCH] Correction to the ZLP fix for the STM32 F4 OTG FS driver git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4591 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/src/stm32/stm32_otgfsdev.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c index 2f297d09f6..948ee45101 100755 --- a/arch/arm/src/stm32/stm32_otgfsdev.c +++ b/arch/arm/src/stm32/stm32_otgfsdev.c @@ -1027,6 +1027,11 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv, if (privreq->req.len == 0) { + /* The ZLP flag is set TRUE whenever we want to force the driver to + * send a zero-length-packet on the next pass through the loop (below). + * The flag is cleared whenever a packet is sent in the loop below. + */ + privep->zlp = true; } @@ -1043,6 +1048,10 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv, bytesleft = privreq->req.len - privreq->req.xfrd; nbytes = bytesleft; + /* Assume no zero-length-packet on the next pass through this loop */ + + privep->zlp = false; + /* Limit the size of the transfer to one full packet and handle * zero-length packets (ZLPs). */ @@ -1053,7 +1062,6 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv, * the request. */ - privep->zlp = false; if (nbytes >= privep->ep.maxpacket) { nbytes = privep->ep.maxpacket; @@ -1066,6 +1074,14 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv, if (bytesleft == privep->ep.maxpacket && (privreq->req.flags & USBDEV_REQFLAGS_NULLPKT) != 0) { + /* The ZLP flag is set TRUE whenever we want to force + * the driver to send a zero-length-packet on the next + * pass through this loop. The flag is cleared (above) + * whenever we are committed to sending any packet and + * set here when we want to force one more pass through + * the loop. + */ + privep->zlp = true; } }