1 files changed, 7 insertions, 56 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index bc272e2a85..8913558e6c 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1004,16 +1004,7 @@ static bool view_battery(void)
                 lcd_putsf(0, 2, "External: %d.%03d V", y / 1000, y % 1000);
 #endif
 #if CONFIG_CHARGING
-#if defined ARCHOS_RECORDER
-                lcd_putsf(0, 3, "Chgr: %s %s",
-                         charger_inserted() ? "present" : "absent",
-                         charger_enabled() ? "on" : "off");
-                lcd_putsf(0, 5, "short delta: %d", short_delta);
-                lcd_putsf(0, 6, "long delta: %d", long_delta);
-                lcd_puts(0, 7, power_message);
-                lcd_putsf(0, 8, "USB Inserted: %s",
-                         usb_inserted() ? "yes" : "no");
-#elif defined IPOD_NANO || defined IPOD_VIDEO
+#if defined IPOD_NANO || defined IPOD_VIDEO
                 int usb_pwr  = (GPIOL_INPUT_VAL & 0x10)?true:false;
                 int ext_pwr  = (GPIOL_INPUT_VAL & 0x08)?false:true;
                 int dock     = (GPIOA_INPUT_VAL & 0x10)?true:false;
@@ -1181,18 +1172,6 @@ static bool view_battery(void)
 
             case 3: /* remaining time estimation: */
 
-#ifdef ARCHOS_RECORDER
-                lcd_putsf(0, 0, "charge_state: %d", charge_state);
-
-                lcd_putsf(0, 1, "Cycle time: %d m", powermgmt_last_cycle_startstop_min);
-
-                lcd_putsf(0, 2, "Lvl@cyc st: %d%%", powermgmt_last_cycle_level);
-
-                lcd_putsf(0, 3, "P=%2d I=%2d", pid_p, pid_i);
-
-                lcd_putsf(0, 4, "Trickle sec: %d/60", trickle_sec);
-#endif /* ARCHOS_RECORDER */
-
 #if (CONFIG_BATTERY_MEASURE & VOLTAGE_MEASURE)
                 lcd_putsf(0, 5, "Last PwrHist: %d.%03dV",
                     power_history[0] / 1000,
@@ -1903,30 +1882,7 @@ static bool dbg_tagcache_info(void)
 }
 #endif
 
-#if CONFIG_CPU == SH7034
-static bool dbg_save_roms(void)
-{
-    int fd;
-    int oldmode = system_memory_guard(MEMGUARD_NONE);
-
-    fd = creat("/internal_rom_0000-FFFF.bin", 0666);
-    if(fd >= 0)
-    {
-        write(fd, (void *)0, 0x10000);
-        close(fd);
-    }
-
-    fd = creat("/internal_rom_2000000-203FFFF.bin", 0666);
-    if(fd >= 0)
-    {
-        write(fd, (void *)0x2000000, 0x40000);
-        close(fd);
-    }
-
-    system_memory_guard(oldmode);
-    return false;
-}
-#elif defined CPU_COLDFIRE
+#if defined CPU_COLDFIRE
 static bool dbg_save_roms(void)
 {
     int fd;
@@ -2091,11 +2047,6 @@ static int radio_callback(int btn, struct gui_synclist *lists)
     simplelist_addline(
                         "sd_set: %d Hz", lv24020lp_get(LV24020LP_SD_SET) );
 #endif /* LV24020LP */
-#if (CONFIG_TUNER & S1A0903X01)
-    simplelist_addline(
-                        "Samsung regs: %08X", s1a0903x01_get(RADIO_ALL));
-    /* This one doesn't return dynamic data atm */
-#endif /* S1A0903X01 */
 #if (CONFIG_TUNER & TEA5767)
     struct tea5767_dbg_info nfo;
     tea5767_dbg_info(&nfo);
@@ -2218,7 +2169,7 @@ static bool dbg_metadatalog(void)
     return false;
 }
 
-#if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE)
+#if defined(CPU_COLDFIRE)
 static bool dbg_set_memory_guard(void)
 {
     static const struct opt_items names[MAXMEMGUARD] = {
@@ -2233,7 +2184,7 @@ static bool dbg_set_memory_guard(void)
 
     return false;
 }
-#endif /* CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) */
+#endif /* defined(CPU_COLDFIRE) */
 
 #if defined(HAVE_EEPROM) && !defined(HAVE_EEPROM_SETTINGS)
 static bool dbg_write_eeprom(void)
@@ -2589,13 +2540,13 @@ static const struct {
     unsigned char *desc; /* string or ID */
     bool (*function) (void); /* return true if USB was connected */
 } menuitems[] = {
-#if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || \
+#if defined(CPU_COLDFIRE) || \
     (defined(CPU_PP) && !(CONFIG_STORAGE & STORAGE_SD)) || \
     CONFIG_CPU == IMX31L || defined(CPU_TCC780X) || CONFIG_CPU == AS3525v2 || \
     CONFIG_CPU == AS3525 || CONFIG_CPU == RK27XX
         { "Dump ROM contents", dbg_save_roms },
 #endif
-#if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || defined(CPU_PP) \
+#if defined(CPU_COLDFIRE) || defined(CPU_PP) \
     || CONFIG_CPU == S3C2440 || CONFIG_CPU == IMX31L || CONFIG_CPU == AS3525 \
     || CONFIG_CPU == DM320 || defined(CPU_S5L870X) || CONFIG_CPU == AS3525v2 \
     || CONFIG_CPU == RK27XX
@@ -2616,7 +2567,7 @@ static const struct {
 #if defined(IRIVER_H100_SERIES) && !defined(SIMULATOR)
         { "S/PDIF analyzer", dbg_spdif },
 #endif
-#if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE)
+#if defined(CPU_COLDFIRE)
         { "Catch mem accesses", dbg_set_memory_guard },
 #endif
         { "View OS stacks", dbg_os },