diff options
Diffstat (limited to 'apps/plugins/iriver_flash.c')
-rw-r--r-- | apps/plugins/iriver_flash.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c index a9cf62d3c4..aa1bdb62b8 100644 --- a/apps/plugins/iriver_flash.c +++ b/apps/plugins/iriver_flash.c | |||
@@ -171,7 +171,7 @@ static void cfi_get_flash_info(struct flash_info* pInfo) | |||
171 | } | 171 | } |
172 | 172 | ||
173 | /***************** User Interface Functions *****************/ | 173 | /***************** User Interface Functions *****************/ |
174 | int wait_for_button(void) | 174 | static int wait_for_button(void) |
175 | { | 175 | { |
176 | int button; | 176 | int button; |
177 | 177 | ||
@@ -184,7 +184,7 @@ int wait_for_button(void) | |||
184 | } | 184 | } |
185 | 185 | ||
186 | /* helper for DoUserDialog() */ | 186 | /* helper for DoUserDialog() */ |
187 | void ShowFlashInfo(struct flash_info* pInfo) | 187 | static void ShowFlashInfo(const struct flash_info* pInfo) |
188 | { | 188 | { |
189 | if (!pInfo->manufacturer) | 189 | if (!pInfo->manufacturer) |
190 | { | 190 | { |
@@ -210,7 +210,7 @@ void ShowFlashInfo(struct flash_info* pInfo) | |||
210 | rb->lcd_update(); | 210 | rb->lcd_update(); |
211 | } | 211 | } |
212 | 212 | ||
213 | bool show_info(void) | 213 | static bool show_info(void) |
214 | { | 214 | { |
215 | struct flash_info fi; | 215 | struct flash_info fi; |
216 | 216 | ||
@@ -226,15 +226,11 @@ bool show_info(void) | |||
226 | return true; | 226 | return true; |
227 | } | 227 | } |
228 | 228 | ||
229 | bool confirm(const char *msg) | 229 | static bool confirm(const char* msg) |
230 | { | 230 | { |
231 | bool ret; | ||
232 | |||
233 | rb->splashf(0, "%s ([PLAY] to CONFIRM)", msg); | 231 | rb->splashf(0, "%s ([PLAY] to CONFIRM)", msg); |
234 | 232 | bool ret = (wait_for_button() == BUTTON_ON); | |
235 | ret = (wait_for_button() == BUTTON_ON); | ||
236 | show_info(); | 233 | show_info(); |
237 | |||
238 | return ret; | 234 | return ret; |
239 | } | 235 | } |
240 | 236 | ||
@@ -465,7 +461,7 @@ int flash_rockbox(const char *filename, int section) | |||
465 | return 0; | 461 | return 0; |
466 | } | 462 | } |
467 | 463 | ||
468 | void show_fatal_error(void) | 464 | static void show_fatal_error(void) |
469 | { | 465 | { |
470 | rb->splash(HZ*30, "Disable idle poweroff, connect AC power and DON'T TURN PLAYER OFF!!"); | 466 | rb->splash(HZ*30, "Disable idle poweroff, connect AC power and DON'T TURN PLAYER OFF!!"); |
471 | rb->splash(HZ*30, "Contact Rockbox developers as soon as possible!"); | 467 | rb->splash(HZ*30, "Contact Rockbox developers as soon as possible!"); |