From 4d25bffc8ac075d30fff780ab682ebbec29c2a46 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Mon, 5 Mar 2007 23:56:28 +0000 Subject: Disable bootloader messages in the ipod bootloader unless the RIGHT button is being held. Messages are still displayed if an error occurs. This needs implementing for the other bootloaders. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12631 a1c6a512-1295-4272-9138-f99709370657 --- bootloader/ipod.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'bootloader/ipod.c') diff --git a/bootloader/ipod.c b/bootloader/ipod.c index 0600ea6..8c0d4fa 100644 --- a/bootloader/ipod.c +++ b/bootloader/ipod.c @@ -223,6 +223,7 @@ void* main(void) { char buf[256]; int i; + int btn; int rc; bool haveretailos; bool button_was_held; @@ -278,6 +279,11 @@ void* main(void) button_init(); #endif + btn=key_pressed(); + + /* Enable bootloader messages */ + if (btn==BUTTON_RIGHT) + verbose = true; lcd_setfont(FONT_SYSFIXED); @@ -314,10 +320,7 @@ void* main(void) pinfo->type, pinfo->size / 2048); - /* Check for a keypress */ - i=key_pressed(); - - if (button_was_held || (i==BUTTON_MENU)) { + if (button_was_held || (btn==BUTTON_MENU)) { /* If either the hold switch was on, or the Menu button was held, then try the Apple firmware */ @@ -349,7 +352,7 @@ void* main(void) /* Everything failed - just loop forever */ printf("No RetailOS detected"); - } else if (i==BUTTON_PLAY) { + } else if (btn==BUTTON_PLAY) { printf("Loading Linux..."); rc=load_raw_firmware(loadbuffer, "/linux.bin", MAX_LOADSIZE); if (rc < EOK) { -- cgit v1.1