diff options
author | Michael Sparmann <theseven@rockbox.org> | 2010-10-10 20:52:46 +0000 |
---|---|---|
committer | Michael Sparmann <theseven@rockbox.org> | 2010-10-10 20:52:46 +0000 |
commit | c599da333e0e69e75329f6b350611303ba644bf6 (patch) | |
tree | 5eaa23689a095d9780ee737d88e5aab07328590e /bootloader | |
parent | e94eea95389567047dbbfd064f456ab8028b2852 (diff) | |
download | rockbox-c599da333e0e69e75329f6b350611303ba644bf6.tar.gz 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.c | 8 |
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) | |||
82 | } | 82 | } |
83 | } | 83 | } |
84 | 84 | ||
85 | /* aes_decrypt() and readfw() functions taken from iLoader. | ||
86 | (C) Michael Sparmann and licenced under GPL v2 or later. | ||
87 | */ | ||
88 | |||
89 | static void aes_decrypt(void* data, uint32_t size) | 85 | static void aes_decrypt(void* data, uint32_t size) |
90 | { | 86 | { |
91 | uint32_t ptr, i; | 87 | uint32_t ptr, i; |
@@ -196,9 +192,9 @@ void main(void) | |||
196 | lcd_set_background(LCD_BLACK); | 192 | lcd_set_background(LCD_BLACK); |
197 | lcd_clear_display(); | 193 | lcd_clear_display(); |
198 | 194 | ||
199 | // button_init(); | 195 | button_init(); |
200 | 196 | ||
201 | btn=0; /* TODO */ | 197 | btn = button_status(); |
202 | 198 | ||
203 | /* Enable bootloader messages */ | 199 | /* Enable bootloader messages */ |
204 | if (btn==BUTTON_RIGHT) | 200 | if (btn==BUTTON_RIGHT) |