diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2010-12-12 20:20:12 +0000 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2010-12-12 20:20:12 +0000 |
| commit | 866a822ac615e85bbcb6315c99ce502569f2a3ae (patch) | |
| tree | d2dd6ebfa1f2e579ae6b8ba228ea7fd6cecb3b39 | |
| parent | ecd80d888e8fe933c68a3618a1edfe7e667a9227 (diff) | |
| download | rockbox-866a822ac615e85bbcb6315c99ce502569f2a3ae.zip rockbox-866a822ac615e85bbcb6315c99ce502569f2a3ae.tar.gz rockbox-866a822ac615e85bbcb6315c99ce502569f2a3ae.tar.bz2 rockbox-866a822ac615e85bbcb6315c99ce502569f2a3ae.tar.xz | |
Only return USB_POWERED if USB_DETECT_BY_DRV is actually defined, which might not be the case for e.g. bootloaders (also fix red)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28820 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/as3525/usb-as3525.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/firmware/target/arm/as3525/usb-as3525.c b/firmware/target/arm/as3525/usb-as3525.c index 1c411b0..123ff04 100644 --- a/firmware/target/arm/as3525/usb-as3525.c +++ b/firmware/target/arm/as3525/usb-as3525.c @@ -68,11 +68,14 @@ int usb_detect(void) * hardware power off (pressing the power button) doesn't work anymore * TODO: Implement USB in rockbox for these players */ return USB_EXTRACTED; -#endif +#elif defined(USB_DETECT_BY_DRV) if(bus_activity && connected) return USB_INSERTED; else if(connected) return USB_POWERED; else return USB_EXTRACTED; +#else + return connected?USB_INSERTED:USB_EXTRACTED; +#endif } |