diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 2cc000de17..cbec60ee62 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -60,8 +60,8 @@ | |||
60 | #include "fat.h" | 60 | #include "fat.h" |
61 | #include "mas.h" | 61 | #include "mas.h" |
62 | #include "eeprom_24cxx.h" | 62 | #include "eeprom_24cxx.h" |
63 | #if defined(HAVE_MMC) || defined(HAVE_HOTSWAP) | 63 | #if defined(HAVE_MMC) || defined(HAVE_ATA_SD) |
64 | #include "ata_mmc.h" | 64 | #include "hotswap.h" |
65 | #endif | 65 | #endif |
66 | #if CONFIG_TUNER | 66 | #if CONFIG_TUNER |
67 | #include "tuner.h" | 67 | #include "tuner.h" |
@@ -1716,7 +1716,7 @@ static bool view_battery(void) | |||
1716 | #endif | 1716 | #endif |
1717 | 1717 | ||
1718 | #ifndef SIMULATOR | 1718 | #ifndef SIMULATOR |
1719 | #if defined(HAVE_MMC) || defined(HAVE_HOTSWAP) | 1719 | #if defined(HAVE_MMC) || defined(HAVE_ATA_SD) |
1720 | #if defined(HAVE_MMC) | 1720 | #if defined(HAVE_MMC) |
1721 | #define CARDTYPE "MMC" | 1721 | #define CARDTYPE "MMC" |
1722 | #else | 1722 | #else |
@@ -1737,10 +1737,12 @@ static int disk_callback(int btn, struct gui_synclist *lists) | |||
1737 | "3.1-3.31", "4.0" }; | 1737 | "3.1-3.31", "4.0" }; |
1738 | if ((btn == ACTION_STD_OK) || (btn == SYS_FS_CHANGED) || (btn == ACTION_REDRAW)) | 1738 | if ((btn == ACTION_STD_OK) || (btn == SYS_FS_CHANGED) || (btn == ACTION_REDRAW)) |
1739 | { | 1739 | { |
1740 | #ifdef HAVE_HOTSWAP | ||
1740 | if (btn == ACTION_STD_OK) | 1741 | if (btn == ACTION_STD_OK) |
1741 | { | 1742 | { |
1742 | *cardnum ^= 0x1; /* change cards */ | 1743 | *cardnum ^= 0x1; /* change cards */ |
1743 | } | 1744 | } |
1745 | #endif | ||
1744 | 1746 | ||
1745 | simplelist_set_line_count(0); | 1747 | simplelist_set_line_count(0); |
1746 | 1748 | ||
@@ -1814,7 +1816,7 @@ static int disk_callback(int btn, struct gui_synclist *lists) | |||
1814 | } | 1816 | } |
1815 | return btn; | 1817 | return btn; |
1816 | } | 1818 | } |
1817 | #else /* !defined(HAVE_MMC) && !defined(HAVE_HOTSWAP) */ | 1819 | #else /* !defined(HAVE_MMC) && !defined(HAVE_ATA_SD) */ |
1818 | static int disk_callback(int btn, struct gui_synclist *lists) | 1820 | static int disk_callback(int btn, struct gui_synclist *lists) |
1819 | { | 1821 | { |
1820 | (void)lists; | 1822 | (void)lists; |
@@ -1948,12 +1950,13 @@ static bool dbg_identify_info(void) | |||
1948 | } | 1950 | } |
1949 | return false; | 1951 | return false; |
1950 | } | 1952 | } |
1951 | #endif /* !defined(HAVE_MMC) && !defined(HAVE_HOTSWAP) */ | 1953 | #endif /* !defined(HAVE_MMC) && !defined(HAVE_ATA_SD) */ |
1954 | |||
1952 | static bool dbg_disk_info(void) | 1955 | static bool dbg_disk_info(void) |
1953 | { | 1956 | { |
1954 | struct simplelist_info info; | 1957 | struct simplelist_info info; |
1955 | simplelist_info_init(&info, "Disk Info", 1, NULL); | 1958 | simplelist_info_init(&info, "Disk Info", 1, NULL); |
1956 | #if defined(HAVE_MMC) || defined(HAVE_HOTSWAP) | 1959 | #if defined(HAVE_MMC) || defined(HAVE_ATA_SD) |
1957 | char title[16]; | 1960 | char title[16]; |
1958 | int card = 0; | 1961 | int card = 0; |
1959 | info.callback_data = (void*)&card; | 1962 | info.callback_data = (void*)&card; |
@@ -2536,7 +2539,7 @@ static const struct the_menu_item menuitems[] = { | |||
2536 | #endif | 2539 | #endif |
2537 | #ifndef SIMULATOR | 2540 | #ifndef SIMULATOR |
2538 | { "View disk info", dbg_disk_info }, | 2541 | { "View disk info", dbg_disk_info }, |
2539 | #if !defined(HAVE_MMC) && !defined(HAVE_HOTSWAP) | 2542 | #if !defined(HAVE_MMC) && !defined(HAVE_ATA_SD) |
2540 | { "Dump ATA identify info", dbg_identify_info}, | 2543 | { "Dump ATA identify info", dbg_identify_info}, |
2541 | #endif | 2544 | #endif |
2542 | #endif | 2545 | #endif |