[U-Boot] [PATCH V2 2/2] USB-CDC: called handle_interrupts inside usb_eth_send

Stefano Babic sbabic at denx.de
Sat Aug 14 10:19:29 CEST 2010


The patch removes an endless loop  in the usb_eth_send
if the tx_complete is not called before going
in the loop. The driver interrupt routine is called
allowing the driver to check if the TX is completed.

Signed-off-by: Stefano Babic <sbabic at denx.de>
---

Changes from V1:
- Comments by Remy Bohmer: moved usb_ep_queue inside timeout
to not break at91 code

 drivers/usb/gadget/ether.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 0b4ed18..f082c03 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -1808,6 +1808,8 @@ static int usb_eth_send(struct eth_device* netdev, volatile void* packet, int le
 	struct usb_request	*req = NULL;
 
 	struct eth_dev *dev = &l_ethdev;
+	unsigned long ts;
+	unsigned long timeout = USB_CONNECT_TIMEOUT;
 	dprintf("%s:...\n",__func__);
 
 	req = dev->tx_req;
@@ -1833,13 +1835,19 @@ static int usb_eth_send(struct eth_device* netdev, volatile void* packet, int le
 #endif
 	dev->tx_qlen=1;
 
+	ts = get_timer(0);
+	packet_sent=0;
 	retval = usb_ep_queue (dev->in_ep, req, GFP_ATOMIC);
 
 	if (!retval)
-		dprintf("%s: packet queued\n",__func__);
+		debug("%s: packet queued\n",__func__);
 	while(!packet_sent)
 	{
-		packet_sent=0;
+		if (get_timer(ts) > timeout) {
+			printf ("timeout sending packets to usb ethernet\n");
+			return -1;
+		}
+		usb_gadget_handle_interrupts();
 	}
 
 	return 0;
-- 
1.6.3.3



More information about the U-Boot mailing list