Make sound fix an option

Author: RocketRobz

arm9/include/configuration.h

@@ -21,6 +21,7 @@ typedef struct configuration {
 	bool boostCpu;
 	bool gameSoftReset;
 	bool asyncPrefetch;
+	bool soundFix;
 	bool logging;
 	bool initDisc;
 	bool dldiPatchNds;

arm9/source/conf_sd.c

@@ -89,6 +89,10 @@ static int callback(const char *section, const char *key, const char *value, voi
 		// Async prefetch
 		conf->asyncPrefetch = (bool)strtol(value, NULL, 0);
 
+	} else if (match(section, "NDS-BOOTSTRAP", key, "SOUND_FIX")) {
+		// Sound fix
+		conf->soundFix = (bool)strtol(value, NULL, 0);
+
 	} else if (match(section, "NDS-BOOTSTRAP", key, "LOGGING")) {
 		// Logging
 		conf->logging = (bool)strtol(value, NULL, 0);

arm9/source/main.c

@@ -134,6 +134,7 @@ static inline void debugConf(configuration* conf) {
 	dbg_printf("boostCpu: %s\n", btoa(conf->boostCpu));
 	dbg_printf("gameSoftReset: %s\n", btoa(conf->gameSoftReset));
 	dbg_printf("asyncPrefetch: %s\n", btoa(conf->asyncPrefetch));
+	dbg_printf("soundFix: %s\n", btoa(conf->soundFix));
 	dbg_printf("logging: %s\n", btoa(conf->logging));
 	dbg_printf("initDisc: %s\n", btoa(conf->initDisc));
 	dbg_printf("dldiPatchNds: %s\n", btoa(conf->dldiPatchNds));

arm9/source/nds_loader_arm9.c

@@ -238,6 +238,7 @@ void runNds(const void* loader, u32 loaderSize, u32 cluster, u32 saveCluster, co
 	lc0->romread_LED     = conf->romread_LED;
 	lc0->gameSoftReset   = conf->gameSoftReset;
 	lc0->asyncPrefetch   = conf->asyncPrefetch;
+	lc0->soundFix        = conf->soundFix;
 	lc0->logging         = conf->logging;
 
 	loadCheatData(conf->cheat_data, conf->cheat_data_len);

bootloader/include/hook.h

@@ -39,7 +39,8 @@ int hookNdsRetailArm7(
 	u32 ROMinRAM,
 	u32 consoleModel,
 	u32 romread_LED,
-	u32 gameSoftReset
+	u32 gameSoftReset,
+	u32 soundFix
 );
 int hookNdsRetailArm9(
 	cardengineArm9* ce9,

bootloader/source/arm7/hook_arm7.c

@@ -253,7 +253,8 @@ int hookNdsRetailArm7(
 	u32 ROMinRAM,
 	u32 consoleModel,
 	u32 romread_LED,
-	u32 gameSoftReset
+	u32 gameSoftReset,
+	u32 soundFix
 ) {
 	nocashMessage("hookNdsRetailArm7");
 
@@ -344,6 +345,7 @@ int hookNdsRetailArm7(
 	ce7->consoleModel            = consoleModel;
 	ce7->romread_LED             = romread_LED;
 	ce7->gameSoftReset           = gameSoftReset;
+	ce7->soundFix                = soundFix;
 
 	u32* ce7_cheat_data = getCheatData(ce7);
 	endCheatData(ce7_cheat_data, &ce7->cheat_data_len);

bootloader/source/arm7/load_crt0.s

@@ -41,6 +41,7 @@
 	.global romread_LED
 	.global gameSoftReset
 	.global asyncPrefetch
+	.global soundFix
 	.global logging
 @---------------------------------------------------------------------------------
 	.align	4
@@ -89,6 +90,8 @@ gameSoftReset:
 	.word	0x00000000
 asyncPrefetch:
 	.word	0x00000000
+soundFix:
+	.word	0x00000000
 logging:
 	.word	0x00000000
 cardengine_arm7_offset:

bootloader/source/arm7/main.arm7.c

@@ -90,6 +90,7 @@ extern u32 consoleModel;
 extern u32 romread_LED;
 extern u32 gameSoftReset;
 extern u32 asyncPrefetch;
+extern u32 soundFix;
 //extern u32 logging;
 
 static void initMBK(void) {
@@ -657,7 +658,8 @@ int arm7_main(void) {
 		ROMinRAM,
 		consoleModel,
 		romread_LED,
-		gameSoftReset
+		gameSoftReset,
+		soundFix
 	);
 	if (errorCode == ERR_NONE) {
 		nocashMessage("Card hook successful");

cardengine/arm7/source/card_engine_header.s

@@ -21,6 +21,7 @@
 .global consoleModel
 .global romread_LED
 .global gameSoftReset
+.global soundFix
 
 #define ICACHE_SIZE	0x2000
 #define DCACHE_SIZE	0x1000
@@ -53,6 +54,8 @@ romread_LED:
 	.word	0x00000000
 gameSoftReset:
 	.word	0x00000000
+soundFix:
+	.word	0x00000000
 cheat_data_offset:    
 	.word	cheat_data - patches_offset
 cheat_data_len:

cardengine/arm7/source/cardengine.c

@@ -58,6 +58,7 @@ extern u32 ROMinRAM;
 extern u32 consoleModel;
 extern u32 romread_LED;
 extern u32 gameSoftReset;
+extern u32 soundFix;
 
 vu32* volatile sharedAddr = (vu32*)CARDENGINE_SHARED_ADDRESS;
 
@@ -350,7 +351,9 @@ static void runCardEngineCheckHalt(void) {
 	if (lockMutex(&cardEgnineCommandMutex)) {
 		initialize();
 
-		cardReadTimeOut = 0;
+		if (soundFix) {
+			cardReadTimeOut = 0;
+		}
 
 		//nocashMessage("runCardEngineCheck mutex ok");
 		if (*(vu32*)(0x027FFB14) == (vu32)0x026FF800) {
@@ -413,8 +416,12 @@ void myIrqHandlerVBlank(void) {
 		runCardEngineCheck();
 	}
 
-	if (*(vu32*)(0x027FFB14) != 0 && cardReadTimeOut != 30) {
-		cardReadTimeOut++;
+	if (soundFix) {
+		if (*(vu32*)(0x027FFB14) != 0 && cardReadTimeOut != 30) {
+			cardReadTimeOut++;
+		}
+	} else {
+		cardReadTimeOut = 30;
 	}
 
 	if (REG_KEYINPUT & (KEY_L | KEY_R | KEY_DOWN | KEY_B)) {

common/include/cardengine_header_arm7.h

@@ -75,6 +75,7 @@ typedef struct cardengineArm7 {
     u32 consoleModel;
     u32 romread_LED;
     u32 gameSoftReset;
+    u32 soundFix;
     u32 cheat_data_offset; //u32* cheat_data;
     u32 cheat_data_len;
     u32* romFile;

common/include/load_crt0.h

@@ -26,6 +26,7 @@ typedef struct loadCrt0 {
     u32 romread_LED;
     u32 gameSoftReset;
     u32 asyncPrefetch;
+    u32 soundFix;
     u32 logging;
     u32 cardengine_arm7_offset; //cardengineArm7* cardengine_arm7;
     u32 cardengine_arm9_offset; //cardengineArm9* cardengine_arm9;