From 0e27bb5be59493e79904cbcf0ea21ee75498f36a Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 28 Oct 2005 18:47:25 +0000 Subject: [PATCH] USB power mode: Made the code ignore the power button (On for recorder fm/v2, OnOff for Ondio) to make it easier to enter USB power mode at startup. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7674 a1c6a512-1295-4272-9138-f99709370657 --- firmware/usb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/firmware/usb.c b/firmware/usb.c index be55622647..8a99683a25 100644 --- a/firmware/usb.c +++ b/firmware/usb.c @@ -58,8 +58,10 @@ void screen_dump(void); /* Nasty again. Defined in apps/ too */ #if CONFIG_KEYPAD == RECORDER_PAD #define USBPOWER_BUTTON BUTTON_F1 +#define USBPOWER_BTN_IGNORE BUTTON_ON #elif CONFIG_KEYPAD == ONDIO_PAD #define USBPOWER_BUTTON BUTTON_MENU +#define USBPOWER_BTN_IGNORE BUTTON_OFF #endif #endif /* HAVE_USB_POWER */ @@ -225,7 +227,7 @@ static void usb_thread(void) else #endif #ifdef HAVE_USB_POWER - if(button_status() == USBPOWER_BUTTON) + if((button_status() & ~USBPOWER_BTN_IGNORE) == USBPOWER_BUTTON) { usb_state = USB_POWERED; }