Simplify and neaten-up usb.c a bit. USB_INSERTED and USB_EXTRACTED are always used as events to indicate cable state. USB_HOSTED is posted to indicated that a host was detected.

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

4 files changed, 11 insertions, 11 deletions

diff --git a/firmware/target/arm/as3525/usb-as3525.c b/firmware/target/arm/as3525/usb-as3525.c
index 6ff235dfce..6c39150c28 100644
--- a/firmware/target/arm/as3525/usb-as3525.c
+++ b/firmware/target/arm/as3525/usb-as3525.c
@@ -46,7 +46,7 @@ void usb_insert_int(void)
 {
     usb_status = USB_INSERTED;
 #ifdef USB_STATUS_BY_EVENT
-    usb_status_event(USB_POWERED);
+    usb_status_event(USB_INSERTED);
 #endif
 }
 
@@ -54,7 +54,7 @@ void usb_remove_int(void)
 {
     usb_status = USB_EXTRACTED;
 #ifdef USB_STATUS_BY_EVENT
-    usb_status_event(USB_UNPOWERED);
+    usb_status_event(USB_EXTRACTED);
 #endif
 }
 
@@ -68,7 +68,7 @@ void usb_drv_usb_detect_event(void)
     int oldstatus = disable_irq_save(); /* May come via USB thread */
 
     if (usb_status == USB_INSERTED)
-        usb_status_event(USB_INSERTED);
+        usb_status_event(USB_HOSTED);
 
     restore_irq(oldstatus);
 #endif
diff --git a/firmware/target/arm/imx233/usb-imx233.c b/firmware/target/arm/imx233/usb-imx233.c
index c275f76916..91fb770190 100644
--- a/firmware/target/arm/imx233/usb-imx233.c
+++ b/firmware/target/arm/imx233/usb-imx233.c
@@ -33,17 +33,17 @@
 
 void usb_insert_int(void)
 {
-    usb_status_event(USB_POWERED);
+    usb_status_event(USB_INSERTED);
 }
 
 void usb_remove_int(void)
 {
-    usb_status_event(USB_UNPOWERED);
+    usb_status_event(USB_EXTRACTED);
 }
 
 void usb_drv_usb_detect_event()
 {
-    usb_status_event(USB_INSERTED);
+    usb_status_event(USB_HOSTED);
 }
 
 void usb_attach(void)
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 c52a9a6dec..19c3b3173f 100644
--- a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
@@ -66,7 +66,7 @@ void usb_connect_event(void)
     usb_status = status;
     /* Notify power that USB charging is potentially available */
     charger_usb_detect_event(status);
-    usb_status_event((status == USB_INSERTED) ? USB_POWERED : USB_UNPOWERED);
+    usb_status_event(status);
 }
 
 int usb_detect(void)
@@ -138,11 +138,11 @@ void usb_drv_int_enable(bool enable)
     }
 }
 
-/* Called during the bus reset interrupt when in detect mode */
+/* Called during the setup packet request by the host */
 void usb_drv_usb_detect_event(void)
 {
     if (usb_drv_powered())
-        usb_status_event(USB_INSERTED);
+        usb_status_event(USB_HOSTED);
 }
 
 /* Called when reading the MBR */
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c
index f1d250d3ec..2ba537f286 100644
--- a/firmware/target/arm/usb-fw-pp502x.c
+++ b/firmware/target/arm/usb-fw-pp502x.c
@@ -212,7 +212,7 @@ static int usb_status = USB_EXTRACTED;
 
 static int usb_timeout_event(struct timeout *tmo)
 {
-    usb_status_event(tmo->data == USB_GPIO_VAL ? USB_POWERED : USB_UNPOWERED);
+    usb_status_event(tmo->data == USB_GPIO_VAL ? USB_INSERTED : USB_EXTRACTED);
     return 0;
 }
 
@@ -231,7 +231,7 @@ 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_INSERTED);
+        usb_status_event(USB_HOSTED);
     }
 }
 #endif /* USB_STATUS_BY_EVENT */