Reorganise USB initialisation to not depend on a specific enumeration sequence, by Bartosz Fabianowski, with minor tweaks by Michael Sevakis (FS#12497)

FreeBSD apparently sends a SET_ADDRESS first, which confused our code.
This patch fixes that, and also simplifies the connection handling a bit.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31582 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 5 insertions, 9 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 85c83015bd..9af8b1f70d 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -787,7 +787,7 @@ Lyre prototype 1 */
 /* Priority in bootloader is wanted */
 #define HAVE_PRIORITY_SCHEDULING
 #define USB_STATUS_BY_EVENT
-#define USB_DETECT_BY_CORE
+#define USB_DETECT_BY_REQUEST
 #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC
 #define INCLUDE_TIMEOUT_API
 #define USB_DRIVER_CLOSE
@@ -815,17 +815,17 @@ Lyre prototype 1 */
 #ifdef HAVE_USBSTACK
 #if CONFIG_USBOTG == USBOTG_ARC
 #define USB_STATUS_BY_EVENT
-#define USB_DETECT_BY_CORE
+#define USB_DETECT_BY_REQUEST
 #define INCLUDE_TIMEOUT_API
 #elif CONFIG_USBOTG == USBOTG_AS3525
 #define USB_STATUS_BY_EVENT
-#define USB_DETECT_BY_CORE
+#define USB_DETECT_BY_REQUEST
 #elif CONFIG_USBOTG == USBOTG_S3C6400X /* FIXME */ && CONFIG_CPU == AS3525v2
 #define USB_STATUS_BY_EVENT
-#define USB_DETECT_BY_CORE
+#define USB_DETECT_BY_REQUEST
 #elif CONFIG_USBOTG == USBOTG_RK27XX
 #define USB_STATUS_BY_EVENT
-#define USB_DETECT_BY_CORE
+#define USB_DETECT_BY_REQUEST
 #endif /* CONFIG_USB == */
 #endif /* HAVE_USBSTACK */
 
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index 4af5617b3e..8954e9cc59 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -39,9 +39,6 @@ enum
     USB_EXTRACTED = 0,       /* Event+State */
     USB_INSERTED,            /* Event+State */
     USB_POWERED,             /* State - transitional indicator if no power */
-#ifdef USB_DETECT_BY_CORE
-    USB_HOSTED,              /* Event - host presence was detected */
-#endif
 #if (CONFIG_STORAGE & STORAGE_MMC)
     USB_REENABLE,            /* Event */
 #endif
diff --git a/firmware/export/usb_drv.h b/firmware/export/usb_drv.h
index c0b4d561f2..969a7b358a 100644
--- a/firmware/export/usb_drv.h
+++ b/firmware/export/usb_drv.h
@@ -24,7 +24,6 @@
 #include "kernel.h"
 
 void usb_drv_startup(void);
-void usb_drv_usb_detect_event(void); /* Target implemented */
 void usb_drv_int_enable(bool enable); /* Target implemented */
 void usb_drv_init(void);
 void usb_drv_exit(void);