From 0ccea3aa83988d660222df606b4ee4964c281782 Mon Sep 17 00:00:00 2001
From: CTCaer <ctcaer@gmail.com>
Date: Wed, 2 Dec 2020 01:16:45 +0200
Subject: [PATCH] usb: Improve UMS ejection heuristic

---
 bdk/usb/usb_gadget_ums.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bdk/usb/usb_gadget_ums.c b/bdk/usb/usb_gadget_ums.c
index c860b80..85c5353 100644
--- a/bdk/usb/usb_gadget_ums.c
+++ b/bdk/usb/usb_gadget_ums.c
@@ -216,6 +216,7 @@ typedef struct _usbd_gadget_ums_t {
 	int  can_stall;
 
 	u32 timeouts;
+	bool xusb;
 
 	void (*system_maintenance)(bool);
 	void *label;
@@ -1546,18 +1547,20 @@ static int received_cbw(usbd_gadget_ums_t *ums, bulk_ctxt_t *bulk_ctxt)
 					if (usb_ops.usb_device_get_port_in_sleep())
 					{
 						ums->set_text(ums->label, "#C7EA46 Status:# EP in sleep");
-						ums->timeouts += 10;
+						ums->timeouts += 14;
 					}
-					else
+					else if (!ums->xusb) // Timeout only on USB2.
+					{
+						ums->timeouts += 4;
 						DPRINTF("USB: EP removable\n");
+					}
 				}
 				else
 				{
 					gfx_printf("USB: EP disabled\n");
 					msleep(500);
+					ums->timeouts += 4;
 				}
-
-				ums->timeouts += 4;
 			}
 
 			if (ums->lun.unmounted)
@@ -1785,7 +1788,10 @@ int usb_device_gadget_ums(usb_ctxt_t *usbs)
 	if (hw_get_chip_id() == GP_HIDREV_MAJOR_T210)
 		usb_device_get_ops(&usb_ops);
 	else
+	{
+		ums.xusb = true;
 		xusb_device_get_ops(&usb_ops);
+	}
 
 	usbs->set_text(usbs->label, "#C7EA46 Status:# Started USB");