Slot-2:

- Fix SLOT-2 connect/disconnect behaviors when switching in and out of auto-detect mode.
- Do some cleanup on the auto-detect code.

desmume/src/addons/slot2_auto.cpp

@@ -18,7 +18,6 @@
 #include "../slot2.h"
 #include "../registers.h"
 #include "../MMU.h"
-#include "../NDSSystem.h"
 #ifdef HOST_WINDOWS
 #include "../windows/inputdx.h"
 #endif
@@ -42,42 +41,8 @@ public:
 	
 	virtual void connect()
 	{
-
+		slot2_selected_type = slot2_DetermineType();
-		NDS_SLOT2_TYPE selection = NDS_SLOT2_NONE;
+		mSelectedImplementation = slot2_List[slot2_selected_type];
-
-		//check game ID in core emulator and select right implementation
-		if (gameInfo.romsize == 0)
-		{}
-		else
-		if ((memcmp(gameInfo.header.gameCode, "UBR",  3) == 0)) selection = NDS_SLOT2_EXPMEMORY; // Opera Browser
-		else
-			if ((memcmp(gameInfo.header.gameCode, "YGH",  3) == 0)) selection = NDS_SLOT2_GUITARGRIP; // Guitar Hero - On Tour
-		else
-			if ((memcmp(gameInfo.header.gameCode, "CGS",  3) == 0)) selection = NDS_SLOT2_GUITARGRIP; // Guitar Hero - On Tour - Decades
-		else
-			if ((memcmp(gameInfo.header.gameCode, "C6Q",  3) == 0)) selection = NDS_SLOT2_GUITARGRIP; // Guitar Hero - On Tour - Modern Hits
-		else
-			if ((memcmp(gameInfo.header.gameCode, "YGR",  3) == 0)) selection = NDS_SLOT2_GUITARGRIP; // Guitar Hero - On Tour (Demo)
-		else
-			if ((memcmp(gameInfo.header.gameCode, "Y56",  3) == 0)) selection = NDS_SLOT2_GUITARGRIP; // Guitar Hero - On Tour - Decades (Demo)
-		else
-			if ((memcmp(gameInfo.header.gameCode, "Y6R",  3) == 0)) selection = NDS_SLOT2_GUITARGRIP; // Guitar Hero - On Tour - Modern Hits (Demo)
-		else
-			if ((memcmp(gameInfo.header.gameCode, "BEP",  3) == 0)) selection = NDS_SLOT2_EASYPIANO; // Easy Piano (EUR)(USA)
-		else
-			if ((memcmp(gameInfo.header.gameCode, "YAA",  3) == 0)) selection = NDS_SLOT2_PADDLE; // Arkanoid DS
-		else
-			if ((memcmp(gameInfo.header.gameCode, "CB6",  3) == 0)) selection = NDS_SLOT2_PADDLE; // Space Bust-A-Move
-		else
-			if ((memcmp(gameInfo.header.gameCode, "YXX",  3) == 0)) selection = NDS_SLOT2_PADDLE; // Space Invaders Extreme
-				else
-			if ((memcmp(gameInfo.header.gameCode, "CV8",  3) == 0)) selection = NDS_SLOT2_PADDLE; // Space Invaders Extreme 2
-		else
-			if (gameInfo.isHomebrew())
-				selection = NDS_SLOT2_PASSME;
-		
-		slot2_selected_type = selection;
-		mSelectedImplementation = slot2_List[selection];
 		mSelectedImplementation->connect();
 		printf("Slot2 auto-selected device type: %s (0x%02X)\n", mSelectedImplementation->info()->name(), mSelectedImplementation->info()->id());
 		

desmume/src/slot2.cpp

@@ -18,6 +18,7 @@
 #include "types.h"
 #include "mem.h"
 #include "MMU.h"
+#include "NDSSystem.h"
 
 //this is the currently-configured cflash mode
 ADDON_CFLASH_MODE CFlash_Mode = ADDON_CFLASH_MODE_RomPath;
@@ -70,7 +71,7 @@ void slot2_Init()
 
 void slot2_Shutdown()
 {
-	for(int i=0; i<ARRAY_SIZE(slot2_List); i++)
+	for(size_t i=0; i<ARRAY_SIZE(slot2_List); i++)
 	{
 		if(slot2_List[i])
 			slot2_List[i]->shutdown();
@@ -102,18 +103,71 @@ void slot2_Reset()
 
 bool slot2_Change(NDS_SLOT2_TYPE changeToType)
 {
-	if((changeToType == slot2_device_type) || (changeToType == slot2_GetSelectedType()))
-		return FALSE; //nothing to do
 	if (changeToType > NDS_SLOT2_COUNT || changeToType < 0)
-		return FALSE;
+		return false;
-	if(slot2_device != NULL)
-		slot2_device->disconnect();
 	
-	slot2_device_type = changeToType;
+	if (slot2_device_type == changeToType)
+	{
+		return false;
+	}
+	else if (slot2_device_type != NDS_SLOT2_AUTO && changeToType == NDS_SLOT2_AUTO)
+	{
+		const NDS_SLOT2_TYPE prevDeviceType = slot2_device_type;
+		const NDS_SLOT2_TYPE autoDeviceType = slot2_DetermineType();
+		
+		if (prevDeviceType != autoDeviceType && slot2_device != NULL)
+		{
+			slot2_device->disconnect();
+		}
+		
+		slot2_setDeviceByType(changeToType);
+		slot2_selected_type = autoDeviceType;
+		
+		if (prevDeviceType != autoDeviceType)
+		{
+			slot2_device->connect();
+		}
+	}
+	else if (slot2_device_type == NDS_SLOT2_AUTO && changeToType != NDS_SLOT2_AUTO)
+	{
+		const NDS_SLOT2_TYPE autoDeviceType = slot2_DetermineType();
+		
+		if (autoDeviceType != changeToType && slot2_device != NULL)
+		{
+			slot2_device->disconnect();
+		}
+		
+		slot2_setDeviceByType(changeToType);
+		
+		if (autoDeviceType != changeToType)
+		{
+			slot2_device->connect();
+		}
+	}
+	else //(slot2_device_type != NDS_SLOT2_AUTO && changeToType != NDS_SLOT2_AUTO)
+	{
+		if (slot2_device != NULL)
+		{
+			slot2_device->disconnect();
+		}
+		
+		slot2_setDeviceByType(changeToType);
+		slot2_device->connect();
+	}
+	
+	return true;
+}
+
+void slot2_setDeviceByType(NDS_SLOT2_TYPE theType)
+{
+	if (theType > NDS_SLOT2_COUNT || theType < 0)
+	{
+		return;
+	}
+	
+	slot2_device_type = theType;
 	slot2_device = slot2_List[slot2_device_type];
 	printf("Slot 2: %s\n", slot2_device->info()->name());
-	slot2_device->connect();
-	return true;
 }
 
 bool slot2_getTypeByID(u8 ID, NDS_SLOT2_TYPE &type)
@@ -149,6 +203,64 @@ NDS_SLOT2_TYPE slot2_GetSelectedType()
 	return slot2_device_type;
 }
 
+NDS_SLOT2_TYPE slot2_DetermineType()
+{
+	NDS_SLOT2_TYPE theType = NDS_SLOT2_NONE;
+	
+	//check game ID in core emulator and select right implementation
+	if (gameInfo.romsize == 0)
+	{
+		return theType;
+	}
+	else if (gameInfo.isHomebrew())
+	{
+		theType = NDS_SLOT2_PASSME;
+	}
+	else
+	{
+		theType = slot2_DetermineTypeByGameCode(gameInfo.header.gameCode);
+	}
+	
+	return theType;
+}
+
+NDS_SLOT2_TYPE slot2_DetermineTypeByGameCode(const char *theGameCode)
+{
+	NDS_SLOT2_TYPE theType = NDS_SLOT2_NONE;
+	
+	struct Slot2AutoDeviceType
+	{
+		const char				*gameCode;
+		const NDS_SLOT2_TYPE	deviceType;
+	};
+	
+	static const Slot2AutoDeviceType gameCodeDeviceTypes[] = {
+		{"UBR", NDS_SLOT2_EXPMEMORY},		// Opera Browser
+		{"YGH", NDS_SLOT2_GUITARGRIP},		// Guitar Hero - On Tour
+		{"CGS", NDS_SLOT2_GUITARGRIP},		// Guitar Hero - On Tour - Decades
+		{"C6Q", NDS_SLOT2_GUITARGRIP},		// Guitar Hero - On Tour - Modern Hits
+		{"YGR", NDS_SLOT2_GUITARGRIP},		// Guitar Hero - On Tour (Demo)
+		{"Y56", NDS_SLOT2_GUITARGRIP},		// Guitar Hero - On Tour - Decades (Demo)
+		{"Y6R", NDS_SLOT2_GUITARGRIP},		// Guitar Hero - On Tour - Modern Hits (Demo)
+		{"BEP", NDS_SLOT2_EASYPIANO},		// Easy Piano (EUR)(USA)
+		{"YAA", NDS_SLOT2_PADDLE},			// Arkanoid DS
+		{"CB6", NDS_SLOT2_PADDLE},			// Space Bust-A-Move
+		{"YXX", NDS_SLOT2_PADDLE},			// Space Invaders Extreme
+		{"CV8", NDS_SLOT2_PADDLE},			// Space Invaders Extreme 2
+	};
+	
+	for(size_t i = 0; i < ARRAY_SIZE(gameCodeDeviceTypes); i++)
+	{
+		if(memcmp(theGameCode, gameCodeDeviceTypes[i].gameCode, 3) == 0)
+		{
+			theType = gameCodeDeviceTypes[i].deviceType;
+			break;
+		}
+	}
+	
+	return theType;
+}
+
 void slot2_Savestate(EMUFILE* os)
 {
 	slot2_device->savestate(os);

desmume/src/slot2.h

@@ -111,6 +111,7 @@ void slot2_Reset();
 
 //change the current device
 bool slot2_Change(NDS_SLOT2_TYPE type);
+void slot2_setDeviceByType(NDS_SLOT2_TYPE theType);
 
 bool slot2_getTypeByID(u8 ID, NDS_SLOT2_TYPE &type);
 
@@ -121,6 +122,10 @@ bool slot2_ChangeByID(u8 ID);
 NDS_SLOT2_TYPE slot2_GetCurrentType();
 NDS_SLOT2_TYPE slot2_GetSelectedType();
 
+//determine which device type is appropriate for the loaded ROM
+NDS_SLOT2_TYPE slot2_DetermineType();
+NDS_SLOT2_TYPE slot2_DetermineTypeByGameCode(const char *theGameCode);
+
 template <u8 PROCNUM, typename T>
 bool slot2_write(u32 addr, T val);