From eaa0d63ccb84bf4342fee4d99e0d507ebf3a58f5 Mon Sep 17 00:00:00 2001
From: Sean Cross <sean@xobs.io>
Date: Fri, 5 Apr 2019 17:33:02 +0800
Subject: [PATCH] usb-epfifo: fix DATA0/DATA1 swaps for Tx

We were sometimes sending DATA0 instead of DATA1.  Fix that.

Signed-off-by: Sean Cross <sean@xobs.io>
---
 sw/src/usb-epfifo.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sw/src/usb-epfifo.c b/sw/src/usb-epfifo.c
index 758e0f0..a9d5561 100644
--- a/sw/src/usb-epfifo.c
+++ b/sw/src/usb-epfifo.c
@@ -127,8 +127,8 @@ int usb_send(struct usb_device *dev, int epnum, const void *data, int total_coun
 int usb_wait_for_send_done(struct usb_device *dev) {
     while (current_data && current_length)
         usb_poll(dev);
-    while (usb_ep_0_in_respond_read() == EPF_ACK)
-        ;
+    while ((usb_ep_0_in_dtb_read() & 1) == 1)
+        usb_poll(dev);
     return 0;
 }
 
@@ -185,6 +185,8 @@ int usb_irq_happened(void) {
 int usb_ack(struct usb_device *dev, int epnum) {
     (void)dev;
     (void)epnum;
+    usb_ep_0_in_dtb_write(1);
+    usb_ep_0_out_dtb_write(1);
     usb_ep_0_out_respond_write(EPF_ACK);
     usb_ep_0_in_respond_write(EPF_ACK);
     return 0;