summaryrefslogtreecommitdiff
path: root/firmware/target/arm/imx31
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-12-15 00:14:36 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-12-15 00:14:36 +0000
commit47bade1437d5281a5aca0ec8b2b9a3956f88f685 (patch)
treee9f48f30bbaeb1b90fad65a65c0d24fec9310d9f /firmware/target/arm/imx31
parent911a355d764dc628fbd9144af3ba33f1bd63de5f (diff)
downloadrockbox-47bade1437d5281a5aca0ec8b2b9a3956f88f685.tar.gz
rockbox-47bade1437d5281a5aca0ec8b2b9a3956f88f685.zip
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
Diffstat (limited to 'firmware/target/arm/imx31')
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c6
1 files changed, 3 insertions, 3 deletions
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)
66 usb_status = status; 66 usb_status = status;
67 /* Notify power that USB charging is potentially available */ 67 /* Notify power that USB charging is potentially available */
68 charger_usb_detect_event(status); 68 charger_usb_detect_event(status);
69 usb_status_event((status == USB_INSERTED) ? USB_POWERED : USB_UNPOWERED); 69 usb_status_event(status);
70} 70}
71 71
72int usb_detect(void) 72int usb_detect(void)
@@ -138,11 +138,11 @@ void usb_drv_int_enable(bool enable)
138 } 138 }
139} 139}
140 140
141/* Called during the bus reset interrupt when in detect mode */ 141/* Called during the setup packet request by the host */
142void usb_drv_usb_detect_event(void) 142void usb_drv_usb_detect_event(void)
143{ 143{
144 if (usb_drv_powered()) 144 if (usb_drv_powered())
145 usb_status_event(USB_INSERTED); 145 usb_status_event(USB_HOSTED);
146} 146}
147 147
148/* Called when reading the MBR */ 148/* Called when reading the MBR */