diff options
Diffstat (limited to 'apps/debug_menu.c')
-rw-r--r-- | apps/debug_menu.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 8c4622828d..26534cc101 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -63,7 +63,7 @@ | |||
63 | #include "fat.h" | 63 | #include "fat.h" |
64 | #include "mas.h" | 64 | #include "mas.h" |
65 | #include "eeprom_24cxx.h" | 65 | #include "eeprom_24cxx.h" |
66 | #if defined(HAVE_MMC) || defined(HAVE_ATA_SD) | 66 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) |
67 | #include "hotswap.h" | 67 | #include "hotswap.h" |
68 | #endif | 68 | #endif |
69 | #if CONFIG_TUNER | 69 | #if CONFIG_TUNER |
@@ -1730,8 +1730,8 @@ static bool view_battery(void) | |||
1730 | #endif | 1730 | #endif |
1731 | 1731 | ||
1732 | #ifndef SIMULATOR | 1732 | #ifndef SIMULATOR |
1733 | #if defined(HAVE_MMC) || defined(HAVE_ATA_SD) | 1733 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) |
1734 | #if defined(HAVE_MMC) | 1734 | #if (CONFIG_STORAGE & STORAGE_MMC) |
1735 | #define CARDTYPE "MMC" | 1735 | #define CARDTYPE "MMC" |
1736 | #else | 1736 | #else |
1737 | #define CARDTYPE "microSD" | 1737 | #define CARDTYPE "microSD" |
@@ -1812,7 +1812,7 @@ static int disk_callback(int btn, struct gui_synclist *lists) | |||
1812 | { | 1812 | { |
1813 | simplelist_addline(SIMPLELIST_ADD_LINE, "Not Found!"); | 1813 | simplelist_addline(SIMPLELIST_ADD_LINE, "Not Found!"); |
1814 | } | 1814 | } |
1815 | #ifndef HAVE_MMC | 1815 | #if (CONFIG_STORAGE & STORAGE_SD) |
1816 | else /* card->initialized < 0 */ | 1816 | else /* card->initialized < 0 */ |
1817 | { | 1817 | { |
1818 | simplelist_addline(SIMPLELIST_ADD_LINE, "Init Error! (%d)", card->initialized); | 1818 | simplelist_addline(SIMPLELIST_ADD_LINE, "Init Error! (%d)", card->initialized); |
@@ -1826,7 +1826,7 @@ static int disk_callback(int btn, struct gui_synclist *lists) | |||
1826 | } | 1826 | } |
1827 | return btn; | 1827 | return btn; |
1828 | } | 1828 | } |
1829 | #else /* !defined(HAVE_MMC) && !defined(HAVE_ATA_SD) */ | 1829 | #else /* !(CONFIG_STORAGE & STORAGE_MMC) && !(CONFIG_STORAGE & STORAGE_SD) */ |
1830 | static int disk_callback(int btn, struct gui_synclist *lists) | 1830 | static int disk_callback(int btn, struct gui_synclist *lists) |
1831 | { | 1831 | { |
1832 | (void)lists; | 1832 | (void)lists; |
@@ -1960,13 +1960,13 @@ static bool dbg_identify_info(void) | |||
1960 | } | 1960 | } |
1961 | return false; | 1961 | return false; |
1962 | } | 1962 | } |
1963 | #endif /* !defined(HAVE_MMC) && !defined(HAVE_ATA_SD) */ | 1963 | #endif /* !(CONFIG_STORAGE & STORAGE_MMC) && !(CONFIG_STORAGE & STORAGE_SD) */ |
1964 | 1964 | ||
1965 | static bool dbg_disk_info(void) | 1965 | static bool dbg_disk_info(void) |
1966 | { | 1966 | { |
1967 | struct simplelist_info info; | 1967 | struct simplelist_info info; |
1968 | simplelist_info_init(&info, "Disk Info", 1, NULL); | 1968 | simplelist_info_init(&info, "Disk Info", 1, NULL); |
1969 | #if defined(HAVE_MMC) || defined(HAVE_ATA_SD) | 1969 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) |
1970 | char title[16]; | 1970 | char title[16]; |
1971 | int card = 0; | 1971 | int card = 0; |
1972 | info.callback_data = (void*)&card; | 1972 | info.callback_data = (void*)&card; |
@@ -2146,7 +2146,7 @@ static bool dbg_save_roms(void) | |||
2146 | 2146 | ||
2147 | return false; | 2147 | return false; |
2148 | } | 2148 | } |
2149 | #elif defined(CPU_PP) && !defined(HAVE_ATA_SD) | 2149 | #elif defined(CPU_PP) && !(CONFIG_STORAGE & STORAGE_SD) |
2150 | static bool dbg_save_roms(void) | 2150 | static bool dbg_save_roms(void) |
2151 | { | 2151 | { |
2152 | int fd; | 2152 | int fd; |
@@ -2467,7 +2467,7 @@ struct the_menu_item { | |||
2467 | }; | 2467 | }; |
2468 | static const struct the_menu_item menuitems[] = { | 2468 | static const struct the_menu_item menuitems[] = { |
2469 | #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || \ | 2469 | #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || \ |
2470 | (defined(CPU_PP) && !defined(HAVE_ATA_SD)) | 2470 | (defined(CPU_PP) && !(CONFIG_STORAGE & STORAGE_SD)) |
2471 | { "Dump ROM contents", dbg_save_roms }, | 2471 | { "Dump ROM contents", dbg_save_roms }, |
2472 | #endif | 2472 | #endif |
2473 | #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || defined(CPU_PP) \ | 2473 | #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) || defined(CPU_PP) \ |
@@ -2504,7 +2504,7 @@ static const struct the_menu_item menuitems[] = { | |||
2504 | #endif | 2504 | #endif |
2505 | #ifndef SIMULATOR | 2505 | #ifndef SIMULATOR |
2506 | { "View disk info", dbg_disk_info }, | 2506 | { "View disk info", dbg_disk_info }, |
2507 | #if !defined(HAVE_MMC) && !defined(HAVE_ATA_SD) | 2507 | #if !(CONFIG_STORAGE & STORAGE_MMC) && !(CONFIG_STORAGE & STORAGE_SD) |
2508 | { "Dump ATA identify info", dbg_identify_info}, | 2508 | { "Dump ATA identify info", dbg_identify_info}, |
2509 | #endif | 2509 | #endif |
2510 | #endif | 2510 | #endif |