From c37555d30d5063512a2146515c581a06389c5276 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sun, 25 Apr 2021 14:32:21 +0100 Subject: [PATCH] FiiO M3K: remove the bootloader install debug menu This menu serves no useful purpose anymore. I plan on adding an improved version of this functionality to the bootloader instead. Change-Id: I6a93625789f7192031eb6cee6708f9a867318622 --- apps/debug_menu.c | 53 ----------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 42d16a4e82..9bbbfaec99 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -126,10 +126,6 @@ #include "bootdata.h" #endif -#ifdef FIIO_M3K -#include "installer.h" -#endif - static const char* threads_getname(int selected_item, void *data, char *buffer, size_t buffer_len) { @@ -2495,52 +2491,6 @@ static bool dbg_boot_data(void) } #endif /* defined(HAVE_BOOTDATA) && !defined(SIMULATOR) */ -#if defined(FIIO_M3K) && !defined(SIMULATOR) -/* Note: this is temporary and should NOT be merged, ensure it is removed */ -static int fiio_debug_menu_action_callback(int action, struct gui_synclist *lists) -{ - if(action == ACTION_REDRAW) { - simplelist_set_line_count(0); - simplelist_addline("Back to menu"); - simplelist_addline("Install bootloader"); - simplelist_addline("Dump bootloader"); - action = ACTION_REDRAW; - } - - if(action == ACTION_STD_OK) { - int sel = gui_synclist_get_sel_pos(lists); - int rc = 0; - switch(sel) { - case 1: - rc = install_bootloader("/boot.install"); - break; - case 2: - rc = dump_bootloader("/boot.dump"); - break; - default: - break; - } - - if(sel == 1 || sel == 2) { - const char* msg = installer_strerror(rc); - splashf(3*HZ, "(%d) %s", rc, msg); - } - - action = ACTION_STD_CANCEL; - } - - return action; -} - -static bool dbg_fiio_menu(void) -{ - struct simplelist_info info; - simplelist_info_init(&info, "FiiO debug menu", 3, NULL); - info.action_callback = fiio_debug_menu_action_callback; - return simplelist_show_list(&info); -} -#endif - /****** The menu *********/ static const struct { unsigned char *desc; /* string or ID */ @@ -2648,9 +2598,6 @@ static const struct { #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) {"Boot data", dbg_boot_data }, #endif -#if defined(FIIO_M3K) && !defined(SIMULATOR) - {"FiiO debug menu", dbg_fiio_menu}, -#endif }; static int menu_action_callback(int btn, struct gui_synclist *lists)