summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525
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/as3525
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/as3525')
-rw-r--r--firmware/target/arm/as3525/usb-as3525.c6
1 files changed, 3 insertions, 3 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)
46{ 46{
47 usb_status = USB_INSERTED; 47 usb_status = USB_INSERTED;
48#ifdef USB_STATUS_BY_EVENT 48#ifdef USB_STATUS_BY_EVENT
49 usb_status_event(USB_POWERED); 49 usb_status_event(USB_INSERTED);
50#endif 50#endif
51} 51}
52 52
@@ -54,7 +54,7 @@ void usb_remove_int(void)
54{ 54{
55 usb_status = USB_EXTRACTED; 55 usb_status = USB_EXTRACTED;
56#ifdef USB_STATUS_BY_EVENT 56#ifdef USB_STATUS_BY_EVENT
57 usb_status_event(USB_UNPOWERED); 57 usb_status_event(USB_EXTRACTED);
58#endif 58#endif
59} 59}
60 60
@@ -68,7 +68,7 @@ void usb_drv_usb_detect_event(void)
68 int oldstatus = disable_irq_save(); /* May come via USB thread */ 68 int oldstatus = disable_irq_save(); /* May come via USB thread */
69 69
70 if (usb_status == USB_INSERTED) 70 if (usb_status == USB_INSERTED)
71 usb_status_event(USB_INSERTED); 71 usb_status_event(USB_HOSTED);
72 72
73 restore_irq(oldstatus); 73 restore_irq(oldstatus);
74#endif 74#endif