diff options
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/iriver_flash.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c index aa1bdb62b8..9d1c3456a6 100644 --- a/apps/plugins/iriver_flash.c +++ b/apps/plugins/iriver_flash.c @@ -701,11 +701,12 @@ int load_romdump(const char *filename) } /* Kind of our main function, defines the application flow. */ -void DoUserDialog(char* filename) +static void DoUserDialog(const char* filename) { - /* this can only work if Rockbox runs in DRAM, not flash ROM */ - if ((uint16_t*)rb >= FB && (uint16_t*)rb < FB + 4096*1024) /* 4 MB max */ - { /* we're running from flash */ + /* check whether we're running from ROM */ + uint16_t* RB = (uint16_t*) rb; + if (RB >= FB && RB < FB + (FLASH_SIZE / sizeof(*FB))) + { rb->splash(HZ*3, "Not from ROM"); return; /* exit */ } @@ -717,14 +718,13 @@ void DoUserDialog(char* filename) return; /* exit */ } - rb->lcd_setfont(FONT_SYSFIXED); if (!show_info()) - return ; + return; /* exit */ if (filename == NULL) { rb->splash(HZ*3, "Please use this plugin with \"Open with...\""); - return ; + return; /* exit */ } audiobuf = rb->plugin_get_audio_buffer((size_t *)&audiobuf_size); @@ -752,7 +752,9 @@ enum plugin_status plugin_start(const void* parameter) /* now go ahead and have fun! */ oldmode = rb->system_memory_guard(MEMGUARD_NONE); /*disable memory guard */ - DoUserDialog((char*) parameter); + rb->lcd_setfont(FONT_SYSFIXED); + DoUserDialog(parameter); + rb->lcd_setfont(FONT_UI); rb->system_memory_guard(oldmode); /* re-enable memory guard */ return PLUGIN_OK; |