diff options
-rw-r--r-- | apps/debug_menu.c | 43 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | 1 |
2 files changed, 0 insertions, 44 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index cbec60ee62..17a5ddb888 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -2244,46 +2244,6 @@ static bool dbg_set_memory_guard(void) | |||
2244 | } | 2244 | } |
2245 | #endif /* CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) */ | 2245 | #endif /* CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) */ |
2246 | 2246 | ||
2247 | #if defined(TOSHIBA_GIGABEAT_F) && !defined(SIMULATOR) | ||
2248 | |||
2249 | extern volatile bool lcd_poweroff; | ||
2250 | |||
2251 | static bool dbg_lcd_power_off(void) | ||
2252 | { | ||
2253 | lcd_setmargins(0, 0); | ||
2254 | |||
2255 | while(1) | ||
2256 | { | ||
2257 | int button; | ||
2258 | |||
2259 | lcd_clear_display(); | ||
2260 | lcd_puts(0, 0, "LCD Power Off"); | ||
2261 | if(lcd_poweroff) | ||
2262 | lcd_puts(1, 1, "Yes"); | ||
2263 | else | ||
2264 | lcd_puts(1, 1, "No"); | ||
2265 | |||
2266 | lcd_update(); | ||
2267 | |||
2268 | button = get_action(CONTEXT_STD,HZ/5); | ||
2269 | switch(button) | ||
2270 | { | ||
2271 | case ACTION_STD_PREV: | ||
2272 | case ACTION_STD_NEXT: | ||
2273 | lcd_poweroff = !lcd_poweroff; | ||
2274 | break; | ||
2275 | case ACTION_STD_OK: | ||
2276 | case ACTION_STD_CANCEL: | ||
2277 | return false; | ||
2278 | default: | ||
2279 | sleep(HZ/10); | ||
2280 | break; | ||
2281 | } | ||
2282 | } | ||
2283 | return false; | ||
2284 | } | ||
2285 | #endif | ||
2286 | |||
2287 | #if defined(HAVE_EEPROM) && !defined(HAVE_EEPROM_SETTINGS) | 2247 | #if defined(HAVE_EEPROM) && !defined(HAVE_EEPROM_SETTINGS) |
2288 | static bool dbg_write_eeprom(void) | 2248 | static bool dbg_write_eeprom(void) |
2289 | { | 2249 | { |
@@ -2498,9 +2458,6 @@ struct the_menu_item { | |||
2498 | bool (*function) (void); /* return true if USB was connected */ | 2458 | bool (*function) (void); /* return true if USB was connected */ |
2499 | }; | 2459 | }; |
2500 | static const struct the_menu_item menuitems[] = { | 2460 | static const struct the_menu_item menuitems[] = { |
2501 | #if defined(TOSHIBA_GIGABEAT_F) && !defined(SIMULATOR) | ||
2502 | { "LCD Power Off", dbg_lcd_power_off }, | ||
2503 | #endif | ||
2504 | #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || \ | 2461 | #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || \ |
2505 | (defined(CPU_PP) && !(defined(SANSA_E200) || defined(SANSA_C200))) | 2462 | (defined(CPU_PP) && !(defined(SANSA_E200) || defined(SANSA_C200))) |
2506 | { "Dump ROM contents", dbg_save_roms }, | 2463 | { "Dump ROM contents", dbg_save_roms }, |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c index 5c666b43f1..37ac903418 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #define LCDADDR(x, y) (&lcd_framebuffer[(y)][(x)]) | 27 | #define LCDADDR(x, y) (&lcd_framebuffer[(y)][(x)]) |
28 | 28 | ||
29 | static volatile bool lcd_on = true; | 29 | static volatile bool lcd_on = true; |
30 | volatile bool lcd_poweroff = false; | ||
31 | static unsigned lcd_yuv_options = 0; | 30 | static unsigned lcd_yuv_options = 0; |
32 | /* | 31 | /* |
33 | ** This is imported from lcd-16bit.c | 32 | ** This is imported from lcd-16bit.c |