Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

The gigabeat S needs special casing so that you can still hold vol down to access its firmware partition. Additionally, the same logic should apply to firewire on the iPods.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29890 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Giacomelli 2011-05-16 21:10:31 +00:00
parent 84b4c46d74
commit e8c79d65e1
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
firmware/export/config/gigabeats.h
View file

@ -190,20 +190,20 @@
#define FREQ cpu_frequency
/* Button that exposures boot partition rather than data during session */
#define USB_BL_INSTALL_MODE_BTN BUTTON_VOL_DOWN
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
#define USBPOWER_BUTTON BUTTON_MENU
#ifndef BOOTLOADER
#define USBPOWER_BTN_IGNORE BUTTON_POWER
#define USBPOWER_BTN_IGNORE USB_BL_INSTALL_MODE_BTN
#else
/* Disable charging-only mode detection in bootloader */
#define USBPOWER_BTN_IGNORE (BUTTON_MAIN | BUTTON_REMOTE)
#endif
/* Button that exposures boot partition rather than data during session */
#define USB_BL_INSTALL_MODE_BTN BUTTON_VOL_DOWN
/* define this if the unit has a battery switch or battery can be removed
* when running */
#define HAVE_BATTERY_SWITCH

3
firmware/export/usb.h
View file

@ -64,7 +64,8 @@ enum {
#elif CONFIG_KEYPAD == ONDIO_PAD
#define USBPOWER_BUTTON BUTTON_MENU
#define USBPOWER_BTN_IGNORE BUTTON_OFF
#else
/*allow people to define this in config-target.h if they need it*/
#elif !defined(USBPOWER_BTN_IGNORE)
#define USBPOWER_BTN_IGNORE 0
#endif
#endif

2
firmware/usb.c
View file

@ -347,7 +347,7 @@ static inline bool usb_power_button(void)
#ifdef USB_FIREWIRE_HANDLING
static inline bool usb_reboot_button(void)
{
return (button_status() & ~USBPOWER_BTN_IGNORE) != USBPOWER_BUTTON;
return (button_status() & ~USBPOWER_BTN_IGNORE);
}
#endif
#else /* !HAVE_USB_POWER */