From 12e50c147f4375a8bd757b3c9e930191c6cdf216 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Mon, 15 Aug 2016 09:35:44 +0200
Subject: [PATCH] Revert "hide SD Gecko setting in vWii builds"

have I been drunk? I must have mistaken SD Gecko for USB Gecko [lol]

This reverts commit e1a1a3c84786540b3033e642bb892ab32c3be06e.
---
 installer/wad.vwii/0001000154484246.tmd  | Bin 592 -> 592 bytes
 main/source/Menus/menu_main.cpp          |   7 +------
 main/source/Menus/menu_settings_file.cpp |  24 +++++++++++------------
 main/source/Menus/menus.h                |   2 +-
 main/source/Tools/load.cpp               |   3 +--
 main/source/Tools/save.cpp               |   2 +-
 main/source/main.cpp                     |   2 +-
 main/source/main.h                       |   2 --
 main/source/xprintf.cpp                  |   7 +------
 9 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/installer/wad.vwii/0001000154484246.tmd b/installer/wad.vwii/0001000154484246.tmd
index c8f0468d8bde264bcf10fc4612f8856a774ead9a..2bb561d935347cb8a9b722fcfd6987e9f3fde9f0 100644
GIT binary patch
delta 30
mcmcb>a)D)o6_Z#*0!zKa+Gn4ZDONnTPY(Z}uu0EBhaUjG{tPhy

delta 30
mcmcb>a)D)o6_Z%dgN-u^nUceV6SALvmN-3yiSgsC(<T7Glno33

diff --git a/main/source/Menus/menu_main.cpp b/main/source/Menus/menu_main.cpp
index f95307b..9f8b85f 100644
--- a/main/source/Menus/menu_main.cpp
+++ b/main/source/Menus/menu_main.cpp
@@ -676,16 +676,11 @@ int MenuMain()
 
 					if(!first)
 					{
-#ifndef VWII
 						if (Options.sdgecko)
 						{
 							xprintf("The HomebrewFilter rev%i\n= == == == == == == == =\nSD Card Gecko initialized.\n\n", SvnRev());
 						}
-						else if
-#else
-						if
-#endif
-						(Options.wifigecko)
+						else if(Options.wifigecko)
 						{
 							WifiGecko_Connect();
 							xprintf("The HomebrewFilter rev%i\n= == == == == == == == =\nWifi Gecko connected.\n\n", SvnRev());
diff --git a/main/source/Menus/menu_settings_file.cpp b/main/source/Menus/menu_settings_file.cpp
index 3fb80d7..6a109ae 100644
--- a/main/source/Menus/menu_settings_file.cpp
+++ b/main/source/Menus/menu_settings_file.cpp
@@ -27,8 +27,8 @@ bool temp_show_all;
 int temp_device_icon;
 int temp_wiiload_ios;
 int temp_wiiload_ahb;
-#ifndef VWII
 bool temp_sdgecko;
+#ifndef VWII
 bool temp_bootmii_boot2;
 #endif
 bool temp_navigation;
@@ -57,8 +57,8 @@ int MenuSettingsFile()
 	else
 		childlock = 1;
 	bool navigation = Options.navigation;
-#ifndef VWII
 	bool sdgecko = Options.sdgecko;
+#ifndef VWII
 	bool bootmii_boot2 = Options.bootmii_boot2;
 #endif
 	string device_dat;
@@ -80,8 +80,8 @@ int MenuSettingsFile()
 	sprintf(options.name[i++], tr("Device icon"));
 	sprintf(options.name[i++], tr("Wiiload IOS"));
 	sprintf(options.name[i++], tr("Wiiload IOS Reload"));
-#ifndef VWII
 	sprintf(options.name[i++], tr("SD Gecko"));
+#ifndef VWII
 	sprintf(options.name[i++], tr("BootMii in Boot2"));
 #endif
 	sprintf(options.name[i++], tr("Childlock"));
@@ -214,11 +214,11 @@ int MenuSettingsFile()
 						change = 3;
 					wiiload_ahb = change;
 					break;
-#ifndef VWII
+
 				case SDGECKO:
 					sdgecko = 1;
 					break;
-
+#ifndef VWII
 				case BOOTMII_BOOT2:
 					bootmii_boot2 = 1;
 					break;
@@ -300,11 +300,11 @@ int MenuSettingsFile()
 						change = 0;
 					wiiload_ahb = change;
 					break;
-#ifndef VWII
+
 				case SDGECKO:
 					sdgecko = 0;
 					break;
-
+#ifndef VWII
 				case BOOTMII_BOOT2:
 					bootmii_boot2 = 0;
 					break;
@@ -338,8 +338,8 @@ int MenuSettingsFile()
 			temp_wiiload_ios		= atoi(options.value[WIILOAD_IOS]);
 			temp_wiiload_ahb		= wiiload_ahb;
 			temp_device_dat			= device_dat;
-#ifndef VWII
 			temp_sdgecko			= sdgecko;
+#ifndef VWII
 			temp_bootmii_boot2      = bootmii_boot2;
 #endif
 			temp_navigation			= navigation;
@@ -400,8 +400,8 @@ int MenuSettingsFile()
 					childlock = 0;
 				else
 					childlock = 1;
-#ifndef VWII
 				sdgecko = temp_sdgecko;
+#ifndef VWII
 				bootmii_boot2 = temp_bootmii_boot2;
 #endif
 				navigation = temp_navigation;
@@ -459,12 +459,12 @@ int MenuSettingsFile()
 				sprintf (options.value[WIILOAD_AHB], tr("IOS Reload"));
 			else if(wiiload_ahb == 2)
 				sprintf (options.value[WIILOAD_AHB], tr("AHB Access"));
-#ifndef VWII
+
 			if(!sdgecko)
 				sprintf (options.value[SDGECKO], tr("No"));
 			else
 				sprintf (options.value[SDGECKO], tr("Yes"));
-
+#ifndef VWII
 			if(!bootmii_boot2)
 				sprintf (options.value[BOOTMII_BOOT2], tr("No"));
 			else
@@ -541,8 +541,8 @@ int MenuSettingsFile()
 			Options.wiiload_ios		= atoi(options.value[WIILOAD_IOS]);
 			Options.wiiload_ahb		= wiiload_ahb;
 			device_dat			= options.value[STORAGE_DEVICE];
-#ifndef VWII
 			Options.sdgecko			= sdgecko;
+#ifndef VWII
 			Options.bootmii_boot2   = bootmii_boot2;
 #endif
 			Options.navigation		= navigation;
diff --git a/main/source/Menus/menus.h b/main/source/Menus/menus.h
index 75deb76..ba1311c 100644
--- a/main/source/Menus/menus.h
+++ b/main/source/Menus/menus.h
@@ -30,8 +30,8 @@ enum
 	DEVICE_ICON,
 	WIILOAD_IOS,
 	WIILOAD_AHB,
-#ifndef VWII
 	SDGECKO,
+#ifndef VWII
 	BOOTMII_BOOT2,
 #endif
 	CHILDLOCK,
diff --git a/main/source/Tools/load.cpp b/main/source/Tools/load.cpp
index bf92294..8cc38c9 100644
--- a/main/source/Tools/load.cpp
+++ b/main/source/Tools/load.cpp
@@ -109,10 +109,9 @@ void load()
 		if(get_setting(source, "navigation") != "")
 			Options.navigation = atoi(get_setting(source, "navigation").c_str());
 
-#ifndef VWII
 		if(get_setting(source, "sdgecko") != "")
 			Options.sdgecko = atoi(get_setting(source, "sdgecko").c_str());
-
+#ifndef VWII
 		if(get_setting(source, "bootmii_boot2") != "")
 			Options.bootmii_boot2 =  atoi(get_setting(source, "bootmii_boot2").c_str());
 #endif
diff --git a/main/source/Tools/save.cpp b/main/source/Tools/save.cpp
index 38cc7e3..0d3793a 100644
--- a/main/source/Tools/save.cpp
+++ b/main/source/Tools/save.cpp
@@ -106,8 +106,8 @@ void save()
 		save_settings << "apps_nr = \""			<< Options.apps			<< "\"" << endl;
 		save_settings << "quick_start = \""		<< Options.quick_start		<< "\"" << endl;
 		save_settings << "show_all = \""		<< Options.show_all		<< "\"" << endl;
-#ifndef VWII
 		save_settings << "sdgecko = \""			<< Options.sdgecko		<< "\"" << endl;
+#ifndef VWII
 		save_settings << "bootmii_boot2 = \""		<< Options.bootmii_boot2	<< "\"" << endl;
 #endif
 		save_settings << "navigation = \""		<< Options.navigation		<< "\"" << endl;
diff --git a/main/source/main.cpp b/main/source/main.cpp
index 34d1e5e..0f07b0c 100644
--- a/main/source/main.cpp
+++ b/main/source/main.cpp
@@ -177,8 +177,8 @@ DefaultOptions()
 	Options.apps		= 4;
 	Options.quick_start	= 0;
 	Options.show_all	= 1;
-#ifndef VWII
 	Options.sdgecko		= 1;
+#ifndef VWII
 	Options.bootmii_boot2   = 0;
 #endif
 	Options.navigation	= 0;
diff --git a/main/source/main.h b/main/source/main.h
index d917f2a..137dfa6 100644
--- a/main/source/main.h
+++ b/main/source/main.h
@@ -127,9 +127,7 @@ struct SOptions
 	bool		quick_start;
 	bool		show_all;
 	int		device_icon;
-#ifndef VWII
 	bool		sdgecko;
-#endif
 	bool		navigation;
 	bool		network;
 	bool		wifigecko;
diff --git a/main/source/xprintf.cpp b/main/source/xprintf.cpp
index d024014..98d4272 100644
--- a/main/source/xprintf.cpp
+++ b/main/source/xprintf.cpp
@@ -26,15 +26,10 @@ extern "C" void sdprintf(const char * format, ...)
 
 extern "C" void xprintf(const char *str, ...)
 {
-#ifndef VWII
 	if(Options.sdgecko)
 		sdprintf(str);
-	else if
-#else
-	if
-#endif
 
-	(Options.wifigecko)
+	else if(Options.wifigecko)
 		wifi_printf(str);
 	else
 		gprintf(str);