From e7ac6f675f9faf5894aea8dd80e01c649933c322 Mon Sep 17 00:00:00 2001
From: Nebuleon Fumika
Date: Tue, 5 Feb 2013 16:35:45 -0500
Subject: Disable the free space line in the options for the time being.
 Currently it invokes a recursive directory scan to calculate how much space
 is used first.

---
 source/nds/gui.c     | 24 ++++++++++++++++++++++--
 source/nds/message.h |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/source/nds/gui.c b/source/nds/gui.c
index 3d2ab70..764ca66 100644
--- a/source/nds/gui.c
+++ b/source/nds/gui.c
@@ -1756,7 +1756,9 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
 	auto void latest_game_menu_end();
 	auto void language_set();
 	auto void game_fastforward();
+#ifdef ENABLE_FREE_SPACE
 	auto void show_card_space();
+#endif
 	auto void savestate_selitem(u32 sel, u32 y_pos);
 	auto void game_state_menu_passive();
 	auto void gamestate_delette_menu_passive();
@@ -2772,6 +2774,7 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
         }
     }
 
+#ifdef ENABLE_FREE_SPACE
 	unsigned int freespace;
     void show_card_space ()
     {
@@ -2815,6 +2818,7 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
         PRINT_STRING_BG(down_screen_addr, line_buffer, COLOR_INACTIVE_ITEM, COLOR_TRANS, 147,
             40 + (display_option->line_number)*27);
     }
+#endif
 
     char *screen_ratio_options[] = { (char*)&msg[MSG_VIDEO_ASPECT_RATIO_0],
 									(char*)&msg[MSG_VIDEO_ASPECT_RATIO_1],
@@ -3004,12 +3008,26 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
 	/* 02 */ STRING_SELECTION_OPTION(language_set, NULL, &msg[FMT_OPTIONS_LANGUAGE], language_options, 
         &emu_config.language, sizeof(language_options) / sizeof(language_options[0]) /* number of possible languages */, NULL, ACTION_TYPE, 2),
 
+#ifdef ENABLE_FREE_SPACE
 	/* 03 */ STRING_SELECTION_OPTION(NULL, show_card_space, &msg[MSG_OPTIONS_CARD_CAPACITY], NULL, 
         &desert, 2, NULL, PASSIVE_TYPE | HIDEN_TYPE, 3),
+#endif
 
-	/* 04 */ ACTION_OPTION(load_default_setting, NULL, &msg[MSG_OPTIONS_RESET], NULL, 4),
+	/* 04 */ ACTION_OPTION(load_default_setting, NULL, &msg[MSG_OPTIONS_RESET], NULL, 
+#ifdef ENABLE_FREE_SPACE
+			4
+#else
+			3
+#endif
+		),
 
-	/* 05 */ ACTION_OPTION(check_gbaemu_version, NULL, &msg[MSG_OPTIONS_VERSION], NULL, 5),
+	/* 05 */ ACTION_OPTION(check_gbaemu_version, NULL, &msg[MSG_OPTIONS_VERSION], NULL, 
+#ifdef ENABLE_FREE_SPACE
+			5
+#else
+			4
+#endif
+		),
 	};
 
 	MAKE_MENU(others, others_menu_init, NULL, NULL, NULL, 1, 1);
@@ -3556,11 +3574,13 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
 
     void others_menu_init()
     {
+#ifdef ENABLE_FREE_SPACE
 		unsigned int total, used;
 
 		//get card space info
 		freespace = 0;
 		fat_getDiskSpaceInfo("fat:", &total, &used, &freespace);
+#endif
     }
 
 	void choose_menu(MENU_TYPE *new_menu)
diff --git a/source/nds/message.h b/source/nds/message.h
index 3eb9e74..b5bb47b 100644
--- a/source/nds/message.h
+++ b/source/nds/message.h
@@ -48,7 +48,7 @@ enum MSG
 	MSG_TOOLS_GAME_HOTKEY_GENERAL,
 	FMT_OPTIONS_LANGUAGE,
 	FMT_OPTIONS_CPU_FREQUENCY,
-	MSG_OPTIONS_CARD_CAPACITY,
+	MSG_OPTIONS_CARD_CAPACITY /* unused if !defined(ENABLE_FREE_SPACE) */,
 	MSG_OPTIONS_RESET,
 	MSG_OPTIONS_VERSION,
 	MSG_SCREENSHOT_CREATE,
-- 
cgit v1.2.3