summaryrefslogtreecommitdiffstats
path: root/firmware/usb.c
diff options
context:
space:
mode:
authorMichael Giacomelli <giac2000@hotmail.com>2011-05-16 20:27:14 +0000
committerMichael Giacomelli <giac2000@hotmail.com>2011-05-16 20:27:14 +0000
commit84b4c46d74d2b757026d425953bf2b033e124016 (patch)
tree84a1cf9411348eeaef21a243d1d07ac258aa0e37 /firmware/usb.c
parent14cac39d19027723cbb4f83bd97001b9a97c793f (diff)
downloadrockbox-84b4c46d74d2b757026d425953bf2b033e124016.tar.gz
rockbox-84b4c46d74d2b757026d425953bf2b033e124016.tar.bz2
rockbox-84b4c46d74d2b757026d425953bf2b033e124016.zip
Enter USB charging mode on devices that support it if any key is held down during USB insert (except on Archos where certain keys need to be avoided and players like the iRiver H1x0 which do not charge over USB and the iAudios/AMSv2 which do not yet support USB fully). Update the manual to explain the new behavior.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29889 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usb.c')
-rw-r--r--firmware/usb.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/firmware/usb.c b/firmware/usb.c
index aada27dfd9..b8e2b5298c 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -341,11 +341,7 @@ static inline void usb_slave_mode(bool on)
#ifdef HAVE_USB_POWER
static inline bool usb_power_button(void)
{
-#if (defined(IRIVER_H10) || defined (IRIVER_H10_5GB)) && !defined(USE_ROCKBOX_USB)
- return (button_status() & ~USBPOWER_BTN_IGNORE) != USBPOWER_BUTTON;
-#else
- return (button_status() & ~USBPOWER_BTN_IGNORE) == USBPOWER_BUTTON;
-#endif
+ return (button_status() & ~USBPOWER_BTN_IGNORE);
}
#ifdef USB_FIREWIRE_HANDLING