summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-09-14 16:00:26 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-09-14 16:00:26 +0000
commit0576e717254702f2b3db06e6e223be919331ab7b (patch)
tree4c954f0f64d089f745b153253384ff9fe6681e66 /firmware
parent82259b7af57eab383b38616a2e391d9b7fcaf967 (diff)
downloadrockbox-0576e717254702f2b3db06e6e223be919331ab7b.tar.gz
rockbox-0576e717254702f2b3db06e6e223be919331ab7b.zip
Scrub r30546 bootloader build errors.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30548 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/target/arm/as3525/usb-as3525.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/firmware/target/arm/as3525/usb-as3525.c b/firmware/target/arm/as3525/usb-as3525.c
index 6dcf99934e..6ff235dfce 100644
--- a/firmware/target/arm/as3525/usb-as3525.c
+++ b/firmware/target/arm/as3525/usb-as3525.c
@@ -45,18 +45,23 @@ void usb_enable(bool on)
void usb_insert_int(void)
{
usb_status = USB_INSERTED;
+#ifdef USB_STATUS_BY_EVENT
usb_status_event(USB_POWERED);
+#endif
}
void usb_remove_int(void)
{
usb_status = USB_EXTRACTED;
+#ifdef USB_STATUS_BY_EVENT
usb_status_event(USB_UNPOWERED);
+#endif
}
void usb_drv_usb_detect_event(void)
{
-#if CONFIG_CPU != AS3525v2 || defined(USE_ROCKBOX_USB)
+#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 */