summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorMichael Sparmann <theseven@rockbox.org>2010-10-10 20:52:46 +0000
committerMichael Sparmann <theseven@rockbox.org>2010-10-10 20:52:46 +0000
commitc599da333e0e69e75329f6b350611303ba644bf6 (patch)
tree5eaa23689a095d9780ee737d88e5aab07328590e /bootloader
parente94eea95389567047dbbfd064f456ab8028b2852 (diff)
downloadrockbox-c599da333e0e69e75329f6b350611303ba644bf6.tar.gz
rockbox-c599da333e0e69e75329f6b350611303ba644bf6.tar.bz2
rockbox-c599da333e0e69e75329f6b350611303ba644bf6.zip
Commit FS#11663 by me - Patch: iPod Nano 2G Bootloader: Boot OF if MENU button is held
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28237 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/ipodnano2g.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/bootloader/ipodnano2g.c b/bootloader/ipodnano2g.c
index b2b2138f78..be714c6273 100644
--- a/bootloader/ipodnano2g.c
+++ b/bootloader/ipodnano2g.c
@@ -82,10 +82,6 @@ void fatal_error(void)
}
}
-/* aes_decrypt() and readfw() functions taken from iLoader.
- (C) Michael Sparmann and licenced under GPL v2 or later.
-*/
-
static void aes_decrypt(void* data, uint32_t size)
{
uint32_t ptr, i;
@@ -196,9 +192,9 @@ void main(void)
lcd_set_background(LCD_BLACK);
lcd_clear_display();
-// button_init();
+ button_init();
- btn=0; /* TODO */
+ btn = button_status();
/* Enable bootloader messages */
if (btn==BUTTON_RIGHT)