From 449a7a66430e2bd28a6b20ba8d03404d70e5c18c Mon Sep 17 00:00:00 2001 From: Karl Kurbjun Date: Wed, 14 May 2008 00:32:43 +0000 Subject: Cleanup some unneeded debug code. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17499 a1c6a512-1295-4272-9138-f99709370657 --- apps/debug_menu.c | 43 ---------------------- .../target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | 1 - 2 files changed, 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) } #endif /* CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) */ -#if defined(TOSHIBA_GIGABEAT_F) && !defined(SIMULATOR) - -extern volatile bool lcd_poweroff; - -static bool dbg_lcd_power_off(void) -{ - lcd_setmargins(0, 0); - - while(1) - { - int button; - - lcd_clear_display(); - lcd_puts(0, 0, "LCD Power Off"); - if(lcd_poweroff) - lcd_puts(1, 1, "Yes"); - else - lcd_puts(1, 1, "No"); - - lcd_update(); - - button = get_action(CONTEXT_STD,HZ/5); - switch(button) - { - case ACTION_STD_PREV: - case ACTION_STD_NEXT: - lcd_poweroff = !lcd_poweroff; - break; - case ACTION_STD_OK: - case ACTION_STD_CANCEL: - return false; - default: - sleep(HZ/10); - break; - } - } - return false; -} -#endif - #if defined(HAVE_EEPROM) && !defined(HAVE_EEPROM_SETTINGS) static bool dbg_write_eeprom(void) { @@ -2498,9 +2458,6 @@ struct the_menu_item { bool (*function) (void); /* return true if USB was connected */ }; static const struct the_menu_item menuitems[] = { -#if defined(TOSHIBA_GIGABEAT_F) && !defined(SIMULATOR) - { "LCD Power Off", dbg_lcd_power_off }, -#endif #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || \ (defined(CPU_PP) && !(defined(SANSA_E200) || defined(SANSA_C200))) { "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 @@ #define LCDADDR(x, y) (&lcd_framebuffer[(y)][(x)]) static volatile bool lcd_on = true; -volatile bool lcd_poweroff = false; static unsigned lcd_yuv_options = 0; /* ** This is imported from lcd-16bit.c -- cgit v1.2.3