diff options
Diffstat (limited to 'apps/debug_menu.c')
-rw-r--r-- | apps/debug_menu.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 92451f284c..e75fce6d32 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -80,11 +80,9 @@ | |||
80 | #include "radio.h" | 80 | #include "radio.h" |
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | #ifdef HAVE_LCD_BITMAP | ||
84 | #include "scrollbar.h" | 83 | #include "scrollbar.h" |
85 | #include "peakmeter.h" | 84 | #include "peakmeter.h" |
86 | #include "skin_engine/skin_engine.h" | 85 | #include "skin_engine/skin_engine.h" |
87 | #endif | ||
88 | #include "logfdisp.h" | 86 | #include "logfdisp.h" |
89 | #include "core_alloc.h" | 87 | #include "core_alloc.h" |
90 | #include "pcmbuf.h" | 88 | #include "pcmbuf.h" |
@@ -300,7 +298,6 @@ static bool dbg_cpuinfo(void) | |||
300 | 298 | ||
301 | #endif | 299 | #endif |
302 | 300 | ||
303 | #ifdef HAVE_LCD_BITMAP | ||
304 | static unsigned int ticks, freq_sum; | 301 | static unsigned int ticks, freq_sum; |
305 | #ifndef CPU_MULTI_FREQUENCY | 302 | #ifndef CPU_MULTI_FREQUENCY |
306 | static unsigned int boost_ticks; | 303 | static unsigned int boost_ticks; |
@@ -442,7 +439,6 @@ static bool dbg_buffering_thread(void) | |||
442 | 439 | ||
443 | return false; | 440 | return false; |
444 | } | 441 | } |
445 | #endif /* HAVE_LCD_BITMAP */ | ||
446 | 442 | ||
447 | static const char* bf_getname(int selected_item, void *data, | 443 | static const char* bf_getname(int selected_item, void *data, |
448 | char *buffer, size_t buffer_len) | 444 | char *buffer, size_t buffer_len) |
@@ -688,9 +684,7 @@ static bool dbg_pcf(void) | |||
688 | { | 684 | { |
689 | int line; | 685 | int line; |
690 | 686 | ||
691 | #ifdef HAVE_LCD_BITMAP | ||
692 | lcd_setfont(FONT_SYSFIXED); | 687 | lcd_setfont(FONT_SYSFIXED); |
693 | #endif | ||
694 | lcd_clear_display(); | 688 | lcd_clear_display(); |
695 | 689 | ||
696 | while(1) | 690 | while(1) |
@@ -731,9 +725,7 @@ static bool dbg_cpufreq(void) | |||
731 | int x = 0; | 725 | int x = 0; |
732 | bool done = false; | 726 | bool done = false; |
733 | 727 | ||
734 | #ifdef HAVE_LCD_BITMAP | ||
735 | lcd_setfont(FONT_SYSFIXED); | 728 | lcd_setfont(FONT_SYSFIXED); |
736 | #endif | ||
737 | lcd_clear_display(); | 729 | lcd_clear_display(); |
738 | 730 | ||
739 | while(!done) | 731 | while(!done) |
@@ -838,7 +830,7 @@ static bool tsc2100_debug(void) | |||
838 | return simplelist_show_list(&info); | 830 | return simplelist_show_list(&info); |
839 | } | 831 | } |
840 | #endif | 832 | #endif |
841 | #if (CONFIG_BATTERY_MEASURE != 0) && defined(HAVE_LCD_BITMAP) && !defined(SIMULATOR) | 833 | #if (CONFIG_BATTERY_MEASURE != 0) && !defined(SIMULATOR) |
842 | /* | 834 | /* |
843 | * view_battery() shows a automatically scaled graph of the battery voltage | 835 | * view_battery() shows a automatically scaled graph of the battery voltage |
844 | * over time. Usable for estimating battery life / charging rate. | 836 | * over time. Usable for estimating battery life / charging rate. |
@@ -1165,7 +1157,7 @@ static bool view_battery(void) | |||
1165 | return false; | 1157 | return false; |
1166 | } | 1158 | } |
1167 | 1159 | ||
1168 | #endif /* (CONFIG_BATTERY_MEASURE != 0) && HAVE_LCD_BITMAP */ | 1160 | #endif /* (CONFIG_BATTERY_MEASURE != 0) */ |
1169 | 1161 | ||
1170 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 1162 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
1171 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) | 1163 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) |
@@ -2103,7 +2095,7 @@ static bool dbg_fm_radio(void) | |||
2103 | #endif /* CONFIG_TUNER */ | 2095 | #endif /* CONFIG_TUNER */ |
2104 | #endif /* !SIMULATOR */ | 2096 | #endif /* !SIMULATOR */ |
2105 | 2097 | ||
2106 | #if defined(HAVE_LCD_BITMAP) && !defined(APPLICATION) | 2098 | #if !defined(APPLICATION) |
2107 | extern bool do_screendump_instead_of_usb; | 2099 | extern bool do_screendump_instead_of_usb; |
2108 | 2100 | ||
2109 | static bool dbg_screendump(void) | 2101 | static bool dbg_screendump(void) |
@@ -2112,7 +2104,7 @@ static bool dbg_screendump(void) | |||
2112 | splashf(HZ, "Screendump %sabled", do_screendump_instead_of_usb?"en":"dis"); | 2104 | splashf(HZ, "Screendump %sabled", do_screendump_instead_of_usb?"en":"dis"); |
2113 | return false; | 2105 | return false; |
2114 | } | 2106 | } |
2115 | #endif /* HAVE_LCD_BITMAP */ | 2107 | #endif /* !APPLICATION */ |
2116 | 2108 | ||
2117 | extern bool write_metadata_log; | 2109 | extern bool write_metadata_log; |
2118 | 2110 | ||
@@ -2397,7 +2389,6 @@ static bool dbg_pic(void) | |||
2397 | } | 2389 | } |
2398 | #endif | 2390 | #endif |
2399 | 2391 | ||
2400 | #ifdef HAVE_LCD_BITMAP | ||
2401 | static bool dbg_skin_engine(void) | 2392 | static bool dbg_skin_engine(void) |
2402 | { | 2393 | { |
2403 | struct simplelist_info info; | 2394 | struct simplelist_info info; |
@@ -2451,7 +2442,6 @@ static bool dbg_skin_engine(void) | |||
2451 | #endif | 2442 | #endif |
2452 | return simplelist_show_list(&info); | 2443 | return simplelist_show_list(&info); |
2453 | } | 2444 | } |
2454 | #endif | ||
2455 | 2445 | ||
2456 | #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) | 2446 | #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) |
2457 | static bool dbg_boot_data(void) | 2447 | static bool dbg_boot_data(void) |
@@ -2528,7 +2518,6 @@ static const struct { | |||
2528 | #ifdef __linux__ | 2518 | #ifdef __linux__ |
2529 | { "View CPU stats", dbg_cpuinfo }, | 2519 | { "View CPU stats", dbg_cpuinfo }, |
2530 | #endif | 2520 | #endif |
2531 | #ifdef HAVE_LCD_BITMAP | ||
2532 | #if (CONFIG_BATTERY_MEASURE != 0) && !defined(SIMULATOR) | 2521 | #if (CONFIG_BATTERY_MEASURE != 0) && !defined(SIMULATOR) |
2533 | { "View battery", view_battery }, | 2522 | { "View battery", view_battery }, |
2534 | #endif | 2523 | #endif |
@@ -2536,7 +2525,6 @@ static const struct { | |||
2536 | { "Screendump", dbg_screendump }, | 2525 | { "Screendump", dbg_screendump }, |
2537 | #endif | 2526 | #endif |
2538 | { "Skin Engine RAM usage", dbg_skin_engine }, | 2527 | { "Skin Engine RAM usage", dbg_skin_engine }, |
2539 | #endif | ||
2540 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || (defined(SONY_NWZ_LINUX) && !defined(SIMULATOR)) | 2528 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || (defined(SONY_NWZ_LINUX) && !defined(SIMULATOR)) |
2541 | { "View HW info", dbg_hw_info }, | 2529 | { "View HW info", dbg_hw_info }, |
2542 | #endif | 2530 | #endif |
@@ -2559,12 +2547,10 @@ static const struct { | |||
2559 | #ifdef HAVE_TAGCACHE | 2547 | #ifdef HAVE_TAGCACHE |
2560 | { "View database info", dbg_tagcache_info }, | 2548 | { "View database info", dbg_tagcache_info }, |
2561 | #endif | 2549 | #endif |
2562 | #ifdef HAVE_LCD_BITMAP | ||
2563 | { "View buffering thread", dbg_buffering_thread }, | 2550 | { "View buffering thread", dbg_buffering_thread }, |
2564 | #ifdef PM_DEBUG | 2551 | #ifdef PM_DEBUG |
2565 | { "pm histogram", peak_meter_histogram}, | 2552 | { "pm histogram", peak_meter_histogram}, |
2566 | #endif /* PM_DEBUG */ | 2553 | #endif /* PM_DEBUG */ |
2567 | #endif /* HAVE_LCD_BITMAP */ | ||
2568 | { "View buflib allocs", dbg_buflib_allocs }, | 2554 | { "View buflib allocs", dbg_buflib_allocs }, |
2569 | #ifndef SIMULATOR | 2555 | #ifndef SIMULATOR |
2570 | #if CONFIG_TUNER | 2556 | #if CONFIG_TUNER |