libretro: triforce support

Author: cscd98

CMakeLists.txt

@@ -505,10 +505,12 @@ if(LIBRETRO)
   if(APPLE)
     set(MACOS_CODE_SIGNING OFF CACHE BOOL "" FORCE)
     set(USE_BUNDLED_MOLTENVK OFF CACHE BOOL "" FORCE)
+    set(USE_SYSTEM_CURL OFF CACHE BOOL "" FORCE)
     set(USE_SYSTEM_GLSLANG OFF CACHE BOOL "" FORCE)
     set(USE_SYSTEM_LZ4 OFF CACHE BOOL "" FORCE)
     set(USE_SYSTEM_LIBLZMA OFF CACHE BOOL "" FORCE)
     set(USE_SYSTEM_LZO OFF CACHE BOOL "" FORCE)
+    set(USE_SYSTEM_MINIZIP_NG OFF CACHE BOOL "" FORCE)
     set(USE_SYSTEM_ZSTD OFF CACHE BOOL "" FORCE)
     set(USE_SYSTEM_ZLIB OFF CACHE BOOL "" FORCE)
   endif()

Source/Core/Core/BootManager.cpp

@@ -205,6 +205,8 @@ bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
       case DiscIO::Region::PAL:
         ipl_path = EUR_DIR DIR_SEP GC_IPL;
         break;
+      case DiscIO::Region::DEV:
+        ipl_path = DEV_DIR DIR_SEP GC_IPL;
       default:
         break;
     }
@@ -242,6 +244,7 @@ bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
             std::move(boot->boot_session_data)),
         wsi);
   }
+
   return Core::Init(system, std::move(boot), wsi);
 }
 

Source/Core/DolphinLibretro/Boot.cpp

@@ -15,6 +15,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/DVD/DVDInterface.h"
+#include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/VideoInterface.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/PowerPC/PowerPC.h"
@@ -199,6 +200,20 @@ bool retro_load_game(const struct retro_game_info* game)
   Config::SetBase(Config::MAIN_BLUETOOTH_PASSTHROUGH_ENABLED,
     Libretro::GetOption<bool>(Libretro::Options::main_bluetooth::BLUETOOTH_PASSTHROUGH, /*def=*/false));
 
+  // SYSCONF (GC)
+  {
+    const std::string value =
+      Libretro::GetOption<std::string>(
+        sysconf_gc::SP1_DEVICE,
+        "255" // ExpansionInterface::EXIDeviceType::None
+      );
+
+    const int device_int = std::stoi(value);
+    const auto device = static_cast<ExpansionInterface::EXIDeviceType>(device_int);
+
+    Config::SetBase(Config::MAIN_SERIAL_PORT_1, device);
+  }
+
   // SYSCONF.IPL
   Config::SetBase(Config::SYSCONF_WIDESCREEN,
                  Libretro::GetOption<bool>(sysconf::WIDESCREEN, /*def=*/true));

Source/Core/DolphinLibretro/Common/Options.cpp

@@ -14,6 +14,7 @@ static std::unordered_map<std::string, bool> optionDirty;
 static constexpr const char* CATEGORY_CORE = "core";
 static constexpr const char* CATEGORY_AUDIO = "audio";
 static constexpr const char* CATEGORY_INTERFACE = "interface";
+static constexpr const char* CATEGORY_GC = "sysconf_gc";
 static constexpr const char* CATEGORY_SYSCONF = "sysconf";
 static constexpr const char* CATEGORY_GFX_HARDWARE = "graphics_hardware";
 static constexpr const char* CATEGORY_GFX_SETTINGS = "graphics_settings";
@@ -38,9 +39,14 @@ static const struct retro_core_option_v2_category option_cats[] = {
     "Interface",
     "Configure on-screen display and logging."
   },
+  {
+    CATEGORY_GC,
+    "System Configuration - Gamecube",
+    "Configure Gamecube system settings."
+  },
   {
     CATEGORY_SYSCONF,
-    "System Configuration",
+    "System Configuration - Wii",
     "Configure Wii system settings."
   },
   {
@@ -412,6 +418,31 @@ static struct retro_core_option_v2_definition option_defs[] = {
     "0"
   },
 
+  // ========== SYSCONF (GC) ==========
+  {
+    Libretro::Options::sysconf_gc::SP1_DEVICE,
+    "System Configuration (GC) > SP1 Device",
+    "SP1 Device",
+    "Select the device connected to the GameCube SP1 slot.",
+    nullptr,
+    CATEGORY_GC,
+    {
+        { "255", "None" },              // EXIDeviceType::None
+        { "0",   "Dummy" },             // EXIDeviceType::Dummy
+        { "5",   "Ethernet" },          // EXIDeviceType::Ethernet
+        { "10",  "Ethernet XLink" },    // EXIDeviceType::EthernetXLink
+        { "11",  "Ethernet TapServer" },// EXIDeviceType::EthernetTapServer
+        { "12",  "Ethernet Built-In" }, // EXIDeviceType::EthernetBuiltIn
+#ifdef HAVE_CPPIPC
+        { "14",  "Ethernet IPC" },      // EXIDeviceType::EthernetIPC
+#endif
+        { "13",  "Modem TapServer" },   // EXIDeviceType::ModemTapServer
+        { "6",   "Baseboard" },         // EXIDeviceType::Baseboard
+        { nullptr, nullptr }
+    },
+    "255" // default: None
+  },
+
   // ========== SYSCONF.IPL ==========
   {
     Libretro::Options::sysconf::WIDESCREEN,

Source/Core/DolphinLibretro/Common/Options.h

@@ -158,7 +158,14 @@ namespace main_bluetooth {
 }  // namespace bluetooth
 
 // ======================================================
-// System Configuration (SYSCONF)
+// System Configuration (SYSCONF) - GC
+// ======================================================
+namespace sysconf_gc {
+  constexpr const char SP1_DEVICE[] = "dolphin_gc_sp1";
+}
+
+// ======================================================
+// System Configuration (SYSCONF) - Wii
 // ======================================================
 namespace sysconf {
   constexpr const char WIDESCREEN[] = "dolphin_widescreen";

Source/Core/DolphinLibretro/Input.cpp

@@ -75,6 +75,8 @@ static struct retro_input_descriptor descGC[] = {
     {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3, "L-Analog"},
     {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "R-Analog"},
     {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "Z"},
+    {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "Triforce - Test"},
+    {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Triforce - Coin"},
     {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start"},
     {0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X,
     "Control Stick X"},
@@ -727,7 +729,10 @@ void retro_set_controller_port_device_gc(unsigned port, unsigned device)
   if (device == RETRO_DEVICE_GC_ON_WII) // Disconnect Wii device if we're using GC controller as device type to avoid conflict
     WiimoteCommon::OnSourceChanged(port, WiimoteSource::None);
 
-  Config::SetBaseOrCurrent(Config::GetInfoForSIDevice(port > 3 ? port - 4 : port), SerialInterface::SIDEVICE_GC_CONTROLLER);
+  Core::System& system = Core::System::GetInstance();
+
+  Config::SetBaseOrCurrent(Config::GetInfoForSIDevice(port > 3 ? port - 4 : port),
+    system.IsTriforce() ? SerialInterface::SIDEVICE_AM_BASEBOARD : SerialInterface::SIDEVICE_GC_CONTROLLER);
   si.ChangeDevice(Config::Get(Config::GetInfoForSIDevice(port > 3 ? port - 4 : port)), port > 3 ? port - 4 : port);
 
   GCPad* gcPad = (GCPad*)Pad::GetConfig()->GetController(port > 3 ? port - 4 : port);
@@ -743,6 +748,7 @@ void retro_set_controller_port_device_gc(unsigned port, unsigned device)
   ControllerEmu::ControlGroup* gcTriggers = gcPad->GetGroup(PadGroup::Triggers);
   ControllerEmu::ControlGroup* gcRumble = gcPad->GetGroup(PadGroup::Rumble);
   ControllerEmu::ControlGroup* gcOptions = gcPad->GetGroup(PadGroup::Options);
+  ControllerEmu::ControlGroup* gcTriforce = gcPad->GetGroup(PadGroup::Triforce);
 #if 0
   ControllerEmu::ControlGroup* gcMic = gcPad->GetGroup(PadGroup::Mic);
 #endif
@@ -772,6 +778,10 @@ void retro_set_controller_port_device_gc(unsigned port, unsigned device)
                                    "`" + devAnalog + ":Trigger0+`|L3");  // L-trigger Soft Press
   gcTriggers->SetControlExpression(3,
                                    "`" + devAnalog + ":Trigger1+`|R3");  // R-trigger Soft Press
+  gcTriforce->SetControlExpression(0, "L");  // Test
+  gcTriforce->SetControlExpression(1, "`" + devAnalog + ":Trigger0+`&`" + devAnalog + ":Trigger1+`");  // Service
+  gcTriforce->SetControlExpression(2, "Select"); // Coin
+
   bool enableRumble = Libretro::Options::GetCached<bool>(Libretro::Options::sysconf::ENABLE_RUMBLE);
   if (enableRumble)
     gcRumble->SetControlExpression(0, "Rumble");

Source/Core/DolphinLibretro/Main.cpp

@@ -333,8 +333,11 @@ bool retro_unserialize(const void* data, size_t size)
 
 unsigned retro_get_region(void)
 {
+  Core::System& system = Core::System::GetInstance();
+
   if (DiscIO::IsNTSC(SConfig::GetInstance().m_region) ||
-      (Core::System::GetInstance().IsWii() && Config::Get(Config::SYSCONF_PAL60)))
+      (Core::System::GetInstance().IsWii() && Config::Get(Config::SYSCONF_PAL60)) ||
+       system.IsTriforce())
     return RETRO_REGION_NTSC;
 
   return RETRO_REGION_PAL;