From ff4b075fbb2f03a5a652183c5fa06bcb89307f1d Mon Sep 17 00:00:00 2001
From: Cyan <cyan06@users.noreply.github.com>
Date: Sun, 14 Apr 2013 21:02:09 +0000
Subject: [PATCH] * Fixed NTFSLib's Mem2 Allocation (Thanks Dimok) * Fixed
 missing parent folder ".." when browsing a NTFS partition. * DML: Updated
 DM(L) detection up to version 2.9 * DEVO: Added F-ZeroAX and TimerFix
 settings        (requires Devolution r196 or newer)

---
 HBC/META.XML                             |   4 +--
 source/GameCube/DEVO_Config.h            |   8 +++--
 source/libs/libntfs/libcustomntfs.a      | Bin 500926 -> 500950 bytes
 source/prompts/PromptWindows.cpp         |   6 ++--
 source/prompts/filebrowser.cpp           |  15 ++++++++-
 source/settings/CGameSettings.cpp        |  14 +++++++++
 source/settings/CGameSettings.h          |   4 +++
 source/settings/CSettings.cpp            |  14 +++++++++
 source/settings/CSettings.h              |   2 ++
 source/settings/menus/GCGameLoadSM.cpp   |  34 +++++++++++++++++---
 source/settings/menus/LoaderSettings.cpp |  26 ++++++++++++++--
 source/system/IosLoader.cpp              |  38 ++++++++++++++---------
 source/system/IosLoader.h                |   4 ++-
 source/usbloader/GameBooter.cpp          |   6 ++++
 14 files changed, 145 insertions(+), 30 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index f83a8a15..7e2167d9 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>3.0 r1211</version>
-		<release_date>20130317132742</release_date>
+		<version>3.0 r1213</version>
+		<release_date>20130413145406</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/source/GameCube/DEVO_Config.h b/source/GameCube/DEVO_Config.h
index ecb76e5d..a81d368c 100644
--- a/source/GameCube/DEVO_Config.h
+++ b/source/GameCube/DEVO_Config.h
@@ -20,13 +20,15 @@
 #define LAUNCH_DEVO() ((void(*)(void))loader_bin)()
 
 #define DEVO_SIG				 0x3EF9DB23
-#define DEVO_CONFIG_VERSION		 0x0110
+#define DEVO_CONFIG_VERSION		 0x0111
 
 enum DEVOConfig
 {
-	DEVO_CFG_WIFILOG		= (1<<0), // added in Devo config version 0x0110
+	DEVO_CFG_WIFILOG		= (1<<0), // added in Devo r100, config version 0x0110
 	DEVO_CFG_WIDE			= (1<<1), // added in Devo r142
-	DEVO_CFG_NOLED			= (1<<2)
+	DEVO_CFG_NOLED			= (1<<2),
+	DEVO_CFG_FZERO_AX		= (1<<3), // added in Devo r196, config version x0111
+	DEVO_CFG_TIMER_FIX		= (1<<4)
 };
 
 typedef struct _DEVO_CFG
diff --git a/source/libs/libntfs/libcustomntfs.a b/source/libs/libntfs/libcustomntfs.a
index 2c6c1ea8195afe450f5aef0c32f1df1db440f470..32107dec9d50553af8f6266a99e4b7868ac6cd2b 100644
GIT binary patch
delta 5206
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
OtTJ-3y)SEv*}nkh<O96`

delta 5060
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
J;E&V*`xp385$6B^

diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index 1a236e1b..d2b07708 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -71,8 +71,10 @@ static const char * DMLVersions[] =
 	"v2.6.1",	// DM 2.6 update 1
 	"v2.7",		// DM 2.7
 	"v2.7",		// DML 2.7
-	"v2.8+",	// DM 2.8
-	"v2.8+",	// DML 2.8
+	"v2.8",		// DML 2.8
+	"v2.8",		// DM 2.8
+	"v2.9+",	// DML 2.9
+	"v2.9+",	// DM 2.9
 };
 
 
diff --git a/source/prompts/filebrowser.cpp b/source/prompts/filebrowser.cpp
index 1588e3dc..4fa07ef5 100644
--- a/source/prompts/filebrowser.cpp
+++ b/source/prompts/filebrowser.cpp
@@ -248,6 +248,19 @@ int ParseDirectory(const char* Path, int Flags, FILTERCASCADE *Filter)
 	}
 
 	struct dirent *dirent = NULL;
+	
+	// Adds parent directory ".." manually if in a subdirectory to fix NTFS folder browsing.
+	if (strcmp(fulldir, browser->rootdir) != 0)
+	{
+		snprintf(filename, sizeof(filename), "..");
+		
+		BROWSERENTRY newEntry;
+		memset(&newEntry, 0, sizeof(BROWSERENTRY)); // clear the new entry
+		strlcpy(newEntry.filename, filename, sizeof(newEntry.filename));
+		strlcpy(newEntry.displayname, filename, sizeof(newEntry.displayname));
+		newEntry.isdir = 1; // flag this as a dir
+		if (ParseFilter(Filter, &newEntry)) browser->browserList.push_back(newEntry);
+	}
 
 	while ((dirent = readdir(dir)) != 0)
 	{
@@ -257,7 +270,7 @@ int ParseDirectory(const char* Path, int Flags, FILTERCASCADE *Filter)
 
 		snprintf(filename, sizeof(filename), dirent->d_name);
 
-		if (strcmp(filename, ".") != 0)
+		if (strcmp(filename, ".") != 0 && strcmp(filename, "..") != 0)
 		{
 			BROWSERENTRY newEntry;
 			memset(&newEntry, 0, sizeof(BROWSERENTRY)); // clear the new entry
diff --git a/source/settings/CGameSettings.cpp b/source/settings/CGameSettings.cpp
index 02bb0247..b691c6c3 100644
--- a/source/settings/CGameSettings.cpp
+++ b/source/settings/CGameSettings.cpp
@@ -219,6 +219,8 @@ bool CGameSettings::Save()
 		fprintf(f, "DEVOMCEmulation:%d; ", GameList[i].DEVOMCEmulation);
 		fprintf(f, "DEVOWidescreen:%d; ", GameList[i].DEVOWidescreen);
 		fprintf(f, "DEVOActivityLED:%d; ", GameList[i].DEVOActivityLED);
+		fprintf(f, "DEVOFZeroAX:%d; ", GameList[i].DEVOFZeroAX);
+		fprintf(f, "DEVOTimerFix:%d; ", GameList[i].DEVOTimerFix);
 		fprintf(f, "Locked:%d;\n", GameList[i].Locked);
 	}
 	fprintf(f, "# END\n");
@@ -399,6 +401,16 @@ bool CGameSettings::SetSetting(GameCFG & game, const char *name, const char *val
 		game.DEVOActivityLED = atoi(value);
 		return true;
 	}
+	else if(strcmp(name, "DEVOFZeroAX") == 0)
+	{
+		game.DEVOFZeroAX = atoi(value);
+		return true;
+	}
+	else if(strcmp(name, "DEVOTimerFix") == 0)
+	{
+		game.DEVOTimerFix = atoi(value);
+		return true;
+	}
 
 	return false;
 }
@@ -533,5 +545,7 @@ void CGameSettings::SetDefault(GameCFG &game)
 	game.DEVOMCEmulation = INHERIT;
 	game.DEVOWidescreen = INHERIT;
 	game.DEVOActivityLED = INHERIT;
+	game.DEVOFZeroAX = INHERIT;
+	game.DEVOTimerFix = INHERIT;
 	game.Locked = OFF;
 }
diff --git a/source/settings/CGameSettings.h b/source/settings/CGameSettings.h
index 077015ec..4abbcc56 100644
--- a/source/settings/CGameSettings.h
+++ b/source/settings/CGameSettings.h
@@ -43,6 +43,8 @@ typedef struct _GameCFG
 	short DEVOMCEmulation;
 	short DEVOWidescreen;
 	short DEVOActivityLED;
+	short DEVOFZeroAX;
+	short DEVOTimerFix;
 	short Locked;
 
 	void operator=(const struct _GameCFG &game)
@@ -81,6 +83,8 @@ typedef struct _GameCFG
 		this->DEVOMCEmulation = game.DEVOMCEmulation;
 		this->DEVOWidescreen = game.DEVOWidescreen;
 		this->DEVOActivityLED = game.DEVOActivityLED;
+		this->DEVOFZeroAX = game.DEVOFZeroAX;
+		this->DEVOTimerFix = game.DEVOTimerFix;
 		this->Locked = game.Locked;
 	}
 } GameCFG;
diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp
index 4337fac3..d56b7fc0 100644
--- a/source/settings/CSettings.cpp
+++ b/source/settings/CSettings.cpp
@@ -183,6 +183,8 @@ void CSettings::SetDefault()
 	DEVOMCEmulation = OFF;
 	DEVOWidescreen = OFF;
 	DEVOActivityLED = ON;
+	DEVOFZeroAX = OFF;
+	DEVOTimerFix = OFF;
 	GCInstallCompressed = OFF;
 	GCInstallAligned = OFF;
 }
@@ -413,6 +415,8 @@ bool CSettings::Save()
 	fprintf(file, "DEVOMCEmulation = %d\n", DEVOMCEmulation);
 	fprintf(file, "DEVOWidescreen = %d\n", DEVOWidescreen);
 	fprintf(file, "DEVOActivityLED = %d\n", DEVOActivityLED);
+	fprintf(file, "DEVOFZeroAX = %d\n", DEVOFZeroAX);
+	fprintf(file, "DEVOTimerFix = %d\n", DEVOTimerFix);
 	fprintf(file, "DEVOLoaderPath = %s\n", DEVOLoaderPath);
 	fprintf(file, "GCInstallCompressed = %d\n", GCInstallCompressed);
 	fprintf(file, "GCInstallAligned = %d\n", GCInstallAligned);
@@ -878,6 +882,16 @@ bool CSettings::SetSetting(char *name, char *value)
 		DEVOActivityLED = atoi(value);
 		return true;
 	}
+	else if (strcmp(name, "DEVOFZeroAX") == 0)
+	{
+		DEVOFZeroAX = atoi(value);
+		return true;
+	}
+	else if (strcmp(name, "DEVOTimerFix") == 0)
+	{
+		DEVOTimerFix = atoi(value);
+		return true;
+	}
 	else if (strcmp(name, "DEVOLoaderPath") == 0)
 	{
 		strlcpy(DEVOLoaderPath, value, sizeof(DEVOLoaderPath));
diff --git a/source/settings/CSettings.h b/source/settings/CSettings.h
index c0cdd4f3..39f21e30 100644
--- a/source/settings/CSettings.h
+++ b/source/settings/CSettings.h
@@ -185,6 +185,8 @@ class CSettings
 		short DEVOMCEmulation;
 		short DEVOWidescreen;
 		short DEVOActivityLED;
+		short DEVOFZeroAX;
+		short DEVOTimerFix;
 		short GCInstallCompressed;
 		short GCInstallAligned;
 
diff --git a/source/settings/menus/GCGameLoadSM.cpp b/source/settings/menus/GCGameLoadSM.cpp
index 4b61df61..984d75c9 100644
--- a/source/settings/menus/GCGameLoadSM.cpp
+++ b/source/settings/menus/GCGameLoadSM.cpp
@@ -179,6 +179,8 @@ void GCGameLoadSM::SetOptionNames()
 	Options->SetName(Idx++, "%s", tr( "DEVO MemCard Emulation" ));
 	Options->SetName(Idx++, "%s", tr( "DEVO Force Widescreen" ));
 	Options->SetName(Idx++, "%s", tr( "DEVO LED Activity" ));
+	Options->SetName(Idx++, "%s", tr( "DEVO F-Zero AX" ));
+	Options->SetName(Idx++, "%s", tr( "DEVO Timer Fix" ));
 }
 
 void GCGameLoadSM::SetOptionValues()
@@ -288,25 +290,37 @@ void GCGameLoadSM::SetOptionValues()
 		else
 			Options->SetValue(Idx++, "%s", tr(DMLDebug[GameConfig.DMLDebug]));
 	}
-	
+
 	//! Settings: DEVO Memory Card Emulation
 	if(GameConfig.DEVOMCEmulation == INHERIT)
 		Options->SetValue(Idx++, tr("Use global"));
 	else
 		Options->SetValue(Idx++, "%s", tr(DEVOMCText[GameConfig.DEVOMCEmulation]));
-	
+
 	//! Settings: DEVO Widescreen Patch
 	if(GameConfig.DEVOWidescreen == INHERIT)
 		Options->SetValue(Idx++, tr("Use global"));
 	else
 		Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DEVOWidescreen]));
-	
+
 	//! Settings: DEVO Activity LED
 	if(GameConfig.DEVOActivityLED == INHERIT)
 		Options->SetValue(Idx++, tr("Use global"));
 	else
 		Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DEVOActivityLED]));
-	
+
+	//! Settings: DEVO F-Zero AX unlock patch
+	if(GameConfig.DEVOFZeroAX == INHERIT)
+		Options->SetValue(Idx++, tr("Use global"));
+	else
+		Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DEVOFZeroAX]));
+
+	//! Settings: DEVO Timer Fix
+	if(GameConfig.DEVOTimerFix == INHERIT)
+		Options->SetValue(Idx++, tr("Use global"));
+	else
+		Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DEVOTimerFix]));
+
 }
 
 int GCGameLoadSM::GetMenuInternal()
@@ -454,6 +468,18 @@ int GCGameLoadSM::GetMenuInternal()
 		if (++GameConfig.DEVOActivityLED >= MAX_ON_OFF) GameConfig.DEVOActivityLED = INHERIT;
 	}
 
+	//! Settings: DEVO F-Zero AX unlock patch
+	else if (ret == ++Idx)
+	{
+		if (++GameConfig.DEVOFZeroAX >= MAX_ON_OFF) GameConfig.DEVOFZeroAX = INHERIT;
+	}
+
+	//! Settings: DEVO Timer Fix
+	else if (ret == ++Idx)
+	{
+		if (++GameConfig.DEVOTimerFix >= MAX_ON_OFF) GameConfig.DEVOTimerFix = INHERIT;
+	}
+
 	SetOptionValues();
 
 	return MENU_NONE;
diff --git a/source/settings/menus/LoaderSettings.cpp b/source/settings/menus/LoaderSettings.cpp
index 93e7900a..37339859 100644
--- a/source/settings/menus/LoaderSettings.cpp
+++ b/source/settings/menus/LoaderSettings.cpp
@@ -190,6 +190,8 @@ LoaderSettings::LoaderSettings()
 	Options->SetName(Idx++, "%s", tr( "DEVO MemCard Emulation" ));
 	Options->SetName(Idx++, "%s", tr( "DEVO Force Widescreen" ));
 	Options->SetName(Idx++, "%s", tr( "DEVO LED Activity" ));
+	Options->SetName(Idx++, "%s", tr( "DEVO F-Zero AX" ));
+	Options->SetName(Idx++, "%s", tr( "DEVO Timer Fix" ));
 
 	SetOptionValues();
 
@@ -321,13 +323,19 @@ void LoaderSettings::SetOptionValues()
 
 	//! Settings: DEVO Memory Card Emulation
 	Options->SetValue(Idx++, "%s", tr(DEVOMCText[Settings.DEVOMCEmulation]));
-	
+
 	//! Settings: DEVO Widescreen Patch
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DEVOWidescreen]));
-	
+
 	//! Settings: DEVO Activity LED
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DEVOActivityLED]));
-	
+
+	//! Settings: DEVO F-Zero AX unlock patch
+	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DEVOFZeroAX]));
+
+	//! Settings: DEVO Timer Fix
+	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DEVOTimerFix]));
+
 }
 
 int LoaderSettings::GetMenuInternal()
@@ -565,6 +573,18 @@ int LoaderSettings::GetMenuInternal()
 		if (++Settings.DEVOActivityLED >= MAX_ON_OFF) Settings.DEVOActivityLED = 0;
 	}
 
+	//! Settings: DEVO F-Zero AX unlock patch
+	else if (ret == ++Idx)
+	{
+		if (++Settings.DEVOFZeroAX >= MAX_ON_OFF) Settings.DEVOFZeroAX = 0;
+	}
+
+	//! Settings: DEVO Activity LED
+	else if (ret == ++Idx)
+	{
+		if (++Settings.DEVOTimerFix >= MAX_ON_OFF) Settings.DEVOTimerFix = 0;
+	}
+
 	SetOptionValues();
 
 	return MENU_NONE;
diff --git a/source/system/IosLoader.cpp b/source/system/IosLoader.cpp
index 38c596f4..2232ecba 100644
--- a/source/system/IosLoader.cpp
+++ b/source/system/IosLoader.cpp
@@ -340,36 +340,44 @@ u8 IosLoader::GetDMLVersion(char* releaseDate)
 	// Timestamp of DML 2.5
 	strptime("Nov  9 2012 21:18:56", "%b %d %Y %H:%M:%S", &time);
 	const time_t dml_2_5_time = mktime(&time);
-	
+
 	// Timestamp of DM 2.6.0
 	strptime("Dec  1 2012 01:52:53", "%b %d %Y %H:%M:%S", &time);
 	const time_t dm_2_6_0_time = mktime(&time);
-	
+
 	// Timestamp of DML 2.6
 	strptime("Dec  1 2012 16:22:29", "%b %d %Y %H:%M:%S", &time);
 	const time_t dml_2_6_time = mktime(&time);
-	
+
 	// Timestamp of DM 2.6.1
 	strptime("Dec  1 2012 16:42:34", "%b %d %Y %H:%M:%S", &time);
 	const time_t dm_2_6_1_time = mktime(&time);
-	
+
 	// Timestamp of DM 2.7
 	strptime("Feb 20 2013 14:54:33", "%b %d %Y %H:%M:%S", &time);
 	const time_t dm_2_7_time = mktime(&time);
-	
+
 	// Timestamp of DML 2.7
 	strptime("Feb 21 2013 03:13:49", "%b %d %Y %H:%M:%S", &time);
 	const time_t dml_2_7_time = mktime(&time);
-	
-	// Timestamp of DM 2.8
-	strptime("Feb 24 2013 14:17:03", "%b %d %Y %H:%M:%S", &time);
-	const time_t dm_2_8_time = mktime(&time);
-	
+
 	// Timestamp of DML 2.8
 	strptime("Feb 24 2013 13:30:29", "%b %d %Y %H:%M:%S", &time);
 	const time_t dml_2_8_time = mktime(&time);
-	
-	
+
+	// Timestamp of DM 2.8
+	strptime("Feb 24 2013 14:17:03", "%b %d %Y %H:%M:%S", &time);
+	const time_t dm_2_8_time = mktime(&time);
+
+	// Timestamp of DML 2.9
+	strptime("Apr  5 2013 18:20:33", "%b %d %Y %H:%M:%S", &time);
+	const time_t dml_2_9_time = mktime(&time);
+
+	// Timestamp of DM 2.9
+	strptime("Apr  5 2013 18:29:35", "%b %d %Y %H:%M:%S", &time);
+	const time_t dm_2_9_time = mktime(&time);
+
+
 	// Current installed version
 	gprintf("built on %s\n", releaseDate);
 
@@ -378,7 +386,8 @@ u8 IosLoader::GetDMLVersion(char* releaseDate)
 
 	if(currentMIOS == DIOS_MIOS)
 	{
-		if(difftime(unixTime, dm_2_8_time) >= 0) 			currentDMLVersion = DML_VERSION_DM_2_8;
+		if(difftime(unixTime, dm_2_9_time) >= 0) 			currentDMLVersion = DML_VERSION_DM_2_9;
+		else if(difftime(unixTime, dm_2_8_time) >= 0) 		currentDMLVersion = DML_VERSION_DM_2_8;
 		else if(difftime(unixTime, dm_2_7_time) >= 0) 		currentDMLVersion = DML_VERSION_DM_2_7;
 		else if(difftime(unixTime, dm_2_6_1_time) >= 0) 	currentDMLVersion = DML_VERSION_DM_2_6_1;
 		else if(difftime(unixTime, dm_2_6_0_time) >= 0) 	currentDMLVersion = DML_VERSION_DM_2_6_0;
@@ -392,7 +401,8 @@ u8 IosLoader::GetDMLVersion(char* releaseDate)
 	}
 	else if(currentMIOS == DIOS_MIOS_LITE)
 	{
-		if(difftime(unixTime, dml_2_8_time) >= 0) 			currentDMLVersion = DML_VERSION_DML_2_8;
+		if(difftime(unixTime, dml_2_9_time) >= 0) 			currentDMLVersion = DML_VERSION_DML_2_9;
+		else if(difftime(unixTime, dml_2_8_time) >= 0) 		currentDMLVersion = DML_VERSION_DML_2_8;
 		else if(difftime(unixTime, dml_2_7_time) >= 0) 		currentDMLVersion = DML_VERSION_DML_2_7;
 		else if(difftime(unixTime, dml_2_6_time) >= 0) 		currentDMLVersion = DML_VERSION_DML_2_6;
 		else if(difftime(unixTime, dml_2_5_time) >= 0) 		currentDMLVersion = DML_VERSION_DML_2_5;
diff --git a/source/system/IosLoader.h b/source/system/IosLoader.h
index 23cf94c5..d3d7fd04 100644
--- a/source/system/IosLoader.h
+++ b/source/system/IosLoader.h
@@ -55,8 +55,10 @@ enum DMLVersions
 	DML_VERSION_DM_2_6_1,	// Dec  1 2012 16:42:34
 	DML_VERSION_DM_2_7,		// Feb 20 2013 14:54:33
 	DML_VERSION_DML_2_7,	// Feb 21 2013 03:13:49
-	DML_VERSION_DM_2_8,		// Feb 24 2013 14:17:03
 	DML_VERSION_DML_2_8,	// Feb 24 2013 13:30:29
+	DML_VERSION_DM_2_8,		// Feb 24 2013 14:17:03
+	DML_VERSION_DML_2_9,	// Apr  5 2013 18:20:33
+	DML_VERSION_DM_2_9,		// Apr  5 2013 18:29:35
 	DML_VERSION_MAX_VERSION,
 };
 
diff --git a/source/usbloader/GameBooter.cpp b/source/usbloader/GameBooter.cpp
index 393bdabd..dec12831 100644
--- a/source/usbloader/GameBooter.cpp
+++ b/source/usbloader/GameBooter.cpp
@@ -720,6 +720,8 @@ int GameBooter::BootDevolution(struct discHdr *gameHdr)
 	u8 devoMCEmulation = game_cfg->DEVOMCEmulation == INHERIT ? Settings.DEVOMCEmulation : game_cfg->DEVOMCEmulation;
 	u8 devoActivityLEDChoice = game_cfg->DEVOActivityLED == INHERIT ? Settings.DEVOActivityLED : game_cfg->DEVOActivityLED;
 	u8 devoWidescreenChoice = game_cfg->DEVOWidescreen == INHERIT ? Settings.DEVOWidescreen : game_cfg->DEVOWidescreen;
+	u8 devoFZeroAXChoice = game_cfg->DEVOFZeroAX == INHERIT ? Settings.DEVOFZeroAX : game_cfg->DEVOFZeroAX;
+	u8 devoTimerFixChoice = game_cfg->DEVOTimerFix == INHERIT ? Settings.DEVOTimerFix : game_cfg->DEVOTimerFix;
 	
 
 	if(gameHdr->type == TYPE_GAME_GC_DISC)
@@ -828,6 +830,10 @@ int GameBooter::BootDevolution(struct discHdr *gameHdr)
 		devo_config->options |= DEVO_CFG_WIDE;
 	if(!devoActivityLEDChoice && DEVO_version >= 142)
 		devo_config->options |= DEVO_CFG_NOLED;				// ON by default
+	if(devoFZeroAXChoice && DEVO_version >= 196)
+		devo_config->options |= DEVO_CFG_FZERO_AX;
+	if(devoTimerFixChoice && DEVO_version >= 196)
+		devo_config->options |= DEVO_CFG_TIMER_FIX;
 	
 	// check memory card
 	if(devoMCEmulation == DEVO_MC_OFF)