Merge pull request #11105 from vpelletier/si_ignore_setGameId

SI: Ignore non-standard setGameID command
dolphin-emu · Nov 16, 2022 · 43e90ca · 43e90ca
2 parents 8a1c28b + fbf9d6e
commit 43e90ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Source/Core/Core/HW/SI/SI_Device.h b/Source/Core/Core/HW/SI/SI_Device.h
@@ -47,6 +47,7 @@ enum class EBufferCommands : u8
   CMD_STATUS = 0x00,
   CMD_READ_GBA = 0x14,
   CMD_WRITE_GBA = 0x15,
+  CMD_SET_GAME_ID = 0x1d,
   CMD_DIRECT = 0x40,
   CMD_ORIGIN = 0x41,
   CMD_RECALIBRATE = 0x42,

diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
@@ -105,6 +105,14 @@ int CSIDevice_GCController::RunBuffer(u8* buffer, int request_length)
     return sizeof(SOrigin);
   }
 
+  // GameID packet, no response needed, nothing to do
+  // On real hardware, this is used to configure the BlueRetro controler
+  // adapter, while licensed accessories ignore this command.
+  case EBufferCommands::CMD_SET_GAME_ID:
+  {
+    return 0;
+  }
+
   // DEFAULT
   default:
   {