From 23e0214d52b119d2c915ab2629ed0e4b27e580a3 Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Fri, 9 Aug 2019 10:20:20 +1200
Subject: [PATCH] Retry control requests for slow flash drives

Conflicts:
	Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c
---
 .../Middlewares/ST/STM32_USB_Host_Library/Core/Inc/usbh_def.h | 4 ++--
 .../ST/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Inc/usbh_def.h b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Inc/usbh_def.h
index c654544..019ff97 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Inc/usbh_def.h
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Inc/usbh_def.h
@@ -187,10 +187,10 @@
 #endif /* USBH_MAX_PIPES_NBR */
 
 #define USBH_DEVICE_ADDRESS_DEFAULT                     0
-#define USBH_MAX_ERROR_COUNT                            2
+#define USBH_MAX_ERROR_COUNT                            10
 #define USBH_DEVICE_ADDRESS                             1
 
-#define USBH_CTRL_TRANSACTION_TIMEOUT_MS                100
+#define USBH_CTRL_TRANSACTION_TIMEOUT_MS                200
 
 
 /**
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c
index 4e42c37..05ad5fc 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c
@@ -826,7 +826,7 @@ static USBH_StatusTypeDef USBH_HandleControl (USBH_HandleTypeDef *phost)
     if (++ phost->Control.errorcount <= USBH_MAX_ERROR_COUNT)
     {
       /* try to recover control */
-      USBH_LL_Stop(phost);
+//      USBH_LL_Stop(phost);
          
       /* Do the transmission again, starting from SETUP Packet */
       phost->Control.state = CTRL_SETUP;