summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-01-05 19:35:51 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-01-05 19:35:51 +0000
commit89a7a8138ec97a038200ab3080710bd101a9ff0e (patch)
tree0d407ed964975d8eb3f13eafd85a3abe18918184 /bootloader
parentf97b9f11e4f95cf87b09f5184e2016d247f72d09 (diff)
downloadrockbox-89a7a8138ec97a038200ab3080710bd101a9ff0e.tar.gz
rockbox-89a7a8138ec97a038200ab3080710bd101a9ff0e.tar.bz2
rockbox-89a7a8138ec97a038200ab3080710bd101a9ff0e.zip
Gigabeat S: Make it a removable mass-storage device. Windows will assign a drive to only the main data partition by default. To access the bootloader partition instead, press 'Vol -' while it connects (in bootloader and firmware). Hopefully doesn't break anything for anyone.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28972 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/gigabeat-s.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index 9c5ad93d1f..c29265ddad 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -71,11 +71,15 @@ static bool pause_if_button_pressed(bool pre_usb)
if (pre_usb && !usb_plugged())
return false;
- /* Exit if no button or only the menu (settings reset) button */
+ /* Exit if no button or only select buttons that have other
+ * functions */
switch (button)
{
- case BUTTON_MENU:
- case BUTTON_NONE:
+ case USB_BL_INSTALL_MODE_BTN:
+ if (!pre_usb)
+ break; /* Only before USB detect */
+ case BUTTON_MENU: /* Settings reset */
+ case BUTTON_NONE: /* Nothing pressed */
return true;
}