From 4c8e2482a6feb63f3449e57205df84b9749fa88c Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 26 Jan 2012 14:47:34 -0800 Subject: [PATCH] Who approves this stuff... use get_volume_for_path('/sdcard') and check for null... Revert "Hide "mount USB storage" option from mount menu when the board has a virtual sdcard" This reverts commit e510810c71b5d4eb4d779c0db2d131d2b1b556af. --- Android.mk | 2 +- extendedcommands.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Android.mk b/Android.mk index 3d7ec26..c63081f 100644 --- a/Android.mk +++ b/Android.mk @@ -40,7 +40,7 @@ LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)" RECOVERY_API_VERSION := 2 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) -BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_UMS_LUNFILE BOARD_RECOVERY_ALWAYS_WIPES BOARD_RECOVERY_HANDLES_MOUNT BOARD_USES_VIRTUAL_SDCARD +BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_UMS_LUNFILE BOARD_RECOVERY_ALWAYS_WIPES BOARD_RECOVERY_HANDLES_MOUNT $(foreach board_define,$(BOARD_RECOVERY_DEFINES), \ $(if $($(board_define)), \ diff --git a/extendedcommands.c b/extendedcommands.c index 4750a05..729778c 100644 --- a/extendedcommands.c +++ b/extendedcommands.c @@ -669,7 +669,6 @@ void show_partition_menu() static char* confirm_format = "Confirm format?"; static char* confirm = "Yes - Format"; char confirm_string[255]; - int ptr = 0; for (;;) { @@ -691,11 +690,8 @@ void show_partition_menu() options[mountable_volumes+i] = e->txt; } -#ifndef BOARD_USES_VIRTUAL_SDCARD options[mountable_volumes+formatable_volumes] = "mount USB storage"; - ptr = 1; -#endif - options[mountable_volumes+formatable_volumes + ptr] = NULL; + options[mountable_volumes+formatable_volumes + 1] = NULL; int chosen_item = get_menu_selection(headers, &options, 0, 0); if (chosen_item == GO_BACK)