diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-09-14 16:00:26 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-09-14 16:00:26 +0000 |
commit | 0576e717254702f2b3db06e6e223be919331ab7b (patch) | |
tree | 4c954f0f64d089f745b153253384ff9fe6681e66 | |
parent | 82259b7af57eab383b38616a2e391d9b7fcaf967 (diff) | |
download | rockbox-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
-rw-r--r-- | firmware/target/arm/as3525/usb-as3525.c | 7 |
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) | |||
45 | void usb_insert_int(void) | 45 | void usb_insert_int(void) |
46 | { | 46 | { |
47 | usb_status = USB_INSERTED; | 47 | usb_status = USB_INSERTED; |
48 | #ifdef USB_STATUS_BY_EVENT | ||
48 | usb_status_event(USB_POWERED); | 49 | usb_status_event(USB_POWERED); |
50 | #endif | ||
49 | } | 51 | } |
50 | 52 | ||
51 | void usb_remove_int(void) | 53 | void usb_remove_int(void) |
52 | { | 54 | { |
53 | usb_status = USB_EXTRACTED; | 55 | usb_status = USB_EXTRACTED; |
56 | #ifdef USB_STATUS_BY_EVENT | ||
54 | usb_status_event(USB_UNPOWERED); | 57 | usb_status_event(USB_UNPOWERED); |
58 | #endif | ||
55 | } | 59 | } |
56 | 60 | ||
57 | void usb_drv_usb_detect_event(void) | 61 | void usb_drv_usb_detect_event(void) |
58 | { | 62 | { |
59 | #if CONFIG_CPU != AS3525v2 || defined(USE_ROCKBOX_USB) | 63 | #if (CONFIG_CPU != AS3525v2 || defined(USE_ROCKBOX_USB)) \ |
64 | && defined (USB_STATUS_BY_EVENT) | ||
60 | /* Rebooting on USB plug can crash these players in a state where | 65 | /* Rebooting on USB plug can crash these players in a state where |
61 | * hardware power off (pressing the power button) doesn't work anymore | 66 | * hardware power off (pressing the power button) doesn't work anymore |
62 | * TODO: Implement USB in rockbox for these players */ | 67 | * TODO: Implement USB in rockbox for these players */ |