From 4fcffcbdf34fc7a619c0626f8478cf06cdf1a043 Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Wed, 4 Jan 2012 21:55:09 +0000
Subject: 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
---
 firmware/target/arm/as3525/usb-as3525.c               | 16 ----------------
 firmware/target/arm/imx233/usb-imx233.c               |  5 -----
 firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c |  7 -------
 firmware/target/arm/pp/usb-fw-pp502x.c                |  9 ---------
 firmware/target/arm/rk27xx/usb-rk27xx.c               |  5 -----
 5 files changed, 42 deletions(-)

(limited to 'firmware/target')

diff --git a/firmware/target/arm/as3525/usb-as3525.c b/firmware/target/arm/as3525/usb-as3525.c
index 508906965e..99ae66dc15 100644
--- a/firmware/target/arm/as3525/usb-as3525.c
+++ b/firmware/target/arm/as3525/usb-as3525.c
@@ -58,22 +58,6 @@ void usb_remove_int(void)
 #endif
 }
 
-void usb_drv_usb_detect_event(void)
-{
-#if (CONFIG_CPU != AS3525v2 || defined(USE_ROCKBOX_USB)) \
-    && defined (USB_STATUS_BY_EVENT)
-/* Rebooting on USB plug can crash these players in a state where
- * hardware power off (pressing the power button) doesn't work anymore
- * TODO: Implement USB in rockbox for these players */
-    int oldstatus = disable_irq_save(); /* May come via USB thread */
-
-    if (usb_status == USB_INSERTED)
-        usb_status_event(USB_HOSTED);
-
-    restore_irq(oldstatus);
-#endif
-}
-
 int usb_detect(void)
 {
     return usb_status;
diff --git a/firmware/target/arm/imx233/usb-imx233.c b/firmware/target/arm/imx233/usb-imx233.c
index e2bab4fef4..a89a2611ba 100644
--- a/firmware/target/arm/imx233/usb-imx233.c
+++ b/firmware/target/arm/imx233/usb-imx233.c
@@ -40,11 +40,6 @@ void usb_remove_int(void)
     usb_status_event(USB_EXTRACTED);
 }
 
-void usb_drv_usb_detect_event()
-{
-    usb_status_event(USB_HOSTED);
-}
-
 void usb_attach(void)
 {
     usb_drv_attach();
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
index 1584ffb574..c838f65c8a 100644
--- a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
@@ -145,13 +145,6 @@ void usb_drv_int_enable(bool enable)
     }
 }
 
-/* Called during the setup packet request by the host */
-void usb_drv_usb_detect_event(void)
-{
-    if (usb_drv_powered())
-        usb_status_event(USB_HOSTED);
-}
-
 /* Called when reading the MBR */
 void usb_fix_mbr(unsigned char *mbr)
 {
diff --git a/firmware/target/arm/pp/usb-fw-pp502x.c b/firmware/target/arm/pp/usb-fw-pp502x.c
index 5272102fad..010cdb718c 100644
--- a/firmware/target/arm/pp/usb-fw-pp502x.c
+++ b/firmware/target/arm/pp/usb-fw-pp502x.c
@@ -224,15 +224,6 @@ void usb_insert_int(void)
     USB_GPIO_INT_CLR = USB_GPIO_MASK;
     timeout_register(&usb_oneshot, usb_timeout_event, HZ/5, val);
 }
-
-/* USB_DETECT_BY_CORE: Called when device descriptor is requested */
-void usb_drv_usb_detect_event(void)
-{
-    /* Filter for invalid bus reset when unplugging by checking the pin state. */
-    if(usb_plugged()) {
-        usb_status_event(USB_HOSTED);
-    }
-}
 #endif /* USB_STATUS_BY_EVENT */
 
 #ifdef HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/target/arm/rk27xx/usb-rk27xx.c b/firmware/target/arm/rk27xx/usb-rk27xx.c
index 2bae9745c0..20bf867c8d 100644
--- a/firmware/target/arm/rk27xx/usb-rk27xx.c
+++ b/firmware/target/arm/rk27xx/usb-rk27xx.c
@@ -30,11 +30,6 @@
 
 int usb_status = USB_EXTRACTED;
 
-void usb_drv_usb_detect_event()
-{
-    usb_status_event(USB_INSERTED);
-}
-
 void usb_init_device(void)
 {
 }
-- 
cgit v1.2.3