Merge pull request #12215 from JosJuice/android-si-devices

Android: Add more GameCube controller types

Source/Core/Core/FreeLookManager.cpp

@@ -118,6 +118,11 @@ std::string FreeLookController::GetName() const
   return std::string("FreeLook") + char('1' + m_index);
 }
 
+InputConfig* FreeLookController::GetConfig() const
+{
+  return FreeLook::GetInputConfig();
+}
+
 void FreeLookController::LoadDefaults(const ControllerInterface& ciface)
 {
   EmulatedController::LoadDefaults(ciface);

Source/Core/Core/FreeLookManager.h

@@ -47,6 +47,7 @@ public:
   explicit FreeLookController(unsigned int index);
 
   std::string GetName() const override;
+  InputConfig* GetConfig() const override;
   void LoadDefaults(const ControllerInterface& ciface) override;
 
   ControllerEmu::ControlGroup* GetGroup(FreeLookGroup group) const;

Source/Core/Core/HW/GBAPadEmu.cpp

@@ -5,6 +5,8 @@
 
 #include <fmt/format.h>
 
+#include "Core/HW/GBAPad.h"
+
 #include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
 #include "InputCommon/GCPadStatus.h"
@@ -43,6 +45,11 @@ std::string GBAPad::GetName() const
   return fmt::format("GBA{}", m_index + 1);
 }
 
+InputConfig* GBAPad::GetConfig() const
+{
+  return Pad::GetGBAConfig();
+}
+
 ControllerEmu::ControlGroup* GBAPad::GetGroup(GBAPadGroup group) const
 {
   switch (group)

Source/Core/Core/HW/GBAPadEmu.h

@@ -29,6 +29,8 @@ public:
 
   std::string GetName() const override;
 
+  InputConfig* GetConfig() const override;
+
   ControllerEmu::ControlGroup* GetGroup(GBAPadGroup group) const;
 
   void LoadDefaults(const ControllerInterface& ciface) override;

Source/Core/Core/HW/GCKeyboardEmu.cpp

@@ -5,6 +5,9 @@
 
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
+
+#include "Core/HW/GCKeyboard.h"
+
 #include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
@@ -84,6 +87,11 @@ std::string GCKeyboard::GetName() const
   return std::string("GCKeyboard") + char('1' + m_index);
 }
 
+InputConfig* GCKeyboard::GetConfig() const
+{
+  return Keyboard::GetConfig();
+}
+
 ControllerEmu::ControlGroup* GCKeyboard::GetGroup(KeyboardGroup group)
 {
   switch (group)

Source/Core/Core/HW/GCKeyboardEmu.h

@@ -31,6 +31,7 @@ public:
   explicit GCKeyboard(unsigned int index);
   KeyboardStatus GetInput() const;
   std::string GetName() const override;
+  InputConfig* GetConfig() const override;
   ControllerEmu::ControlGroup* GetGroup(KeyboardGroup group);
   void LoadDefaults(const ControllerInterface& ciface) override;
 

Source/Core/Core/HW/GCPadEmu.cpp

@@ -8,6 +8,8 @@
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
 
+#include "Core/HW/GCPad.h"
+
 #include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/Control/Output.h"
 #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h"
@@ -15,7 +17,6 @@
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h"
 #include "InputCommon/ControllerEmu/StickGate.h"
-
 #include "InputCommon/GCPadStatus.h"
 
 static const u16 button_bitmasks[] = {
@@ -95,6 +96,11 @@ std::string GCPad::GetName() const
   return std::string("GCPad") + char('1' + m_index);
 }
 
+InputConfig* GCPad::GetConfig() const
+{
+  return Pad::GetConfig();
+}
+
 ControllerEmu::ControlGroup* GCPad::GetGroup(PadGroup group)
 {
   switch (group)

Source/Core/Core/HW/GCPadEmu.h

@@ -43,6 +43,8 @@ public:
 
   std::string GetName() const override;
 
+  InputConfig* GetConfig() const override;
+
   ControllerEmu::ControlGroup* GetGroup(PadGroup group);
 
   void LoadDefaults(const ControllerInterface& ciface) override;

Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp

@@ -10,6 +10,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/Inline.h"
 
+#include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
@@ -36,6 +37,11 @@ std::string Extension::GetDisplayName() const
   return m_display_name;
 }
 
+InputConfig* Extension::GetConfig() const
+{
+  return ::Wiimote::GetConfig();
+}
+
 None::None() : Extension("None")
 {
 }

Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h

@@ -27,6 +27,8 @@ public:
   std::string GetName() const override;
   std::string GetDisplayName() const override;
 
+  InputConfig* GetConfig() const override;
+
   // Used by the wiimote to detect extension changes.
   // The normal extensions short this pin so it's always connected,
   // but M+ does some tricks with it during activation.

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp

@@ -324,6 +324,11 @@ std::string Wiimote::GetName() const
   return fmt::format("Wiimote{}", 1 + m_index);
 }
 
+InputConfig* Wiimote::GetConfig() const
+{
+  return ::Wiimote::GetConfig();
+}
+
 ControllerEmu::ControlGroup* Wiimote::GetWiimoteGroup(WiimoteGroup group) const
 {
   switch (group)

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h

@@ -137,6 +137,9 @@ public:
   ~Wiimote();
 
   std::string GetName() const override;
+
+  InputConfig* GetConfig() const override;
+
   void LoadDefaults(const ControllerInterface& ciface) override;
 
   ControllerEmu::ControlGroup* GetWiimoteGroup(WiimoteGroup group) const;

Source/Core/Core/HotkeyManager.cpp

@@ -383,6 +383,11 @@ std::string HotkeyManager::GetName() const
   return "Hotkeys";
 }
 
+InputConfig* HotkeyManager::GetConfig() const
+{
+  return HotkeyManagerEmu::GetConfig();
+}
+
 void HotkeyManager::GetInput(HotkeyStatus* kb, bool ignore_focus)
 {
   const auto lock = GetStateLock();

Source/Core/Core/HotkeyManager.h

@@ -233,6 +233,7 @@ public:
 
   void GetInput(HotkeyStatus* hk, bool ignore_focus);
   std::string GetName() const override;
+  InputConfig* GetConfig() const override;
   ControllerEmu::ControlGroup* GetHotkeyGroup(HotkeyGroup group) const;
   int FindGroupByID(int id) const;
   int GetIndexForGroup(int group, int id) const;

Source/Core/InputCommon/ControllerEmu/ControllerEmu.h

@@ -19,6 +19,7 @@
 #include "InputCommon/ControllerInterface/CoreDevice.h"
 
 class ControllerInterface;
+class InputConfig;
 
 constexpr const char* DIRECTION_UP = _trans("Up");
 constexpr const char* DIRECTION_DOWN = _trans("Down");
@@ -180,6 +181,8 @@ public:
   virtual std::string GetName() const = 0;
   virtual std::string GetDisplayName() const;
 
+  virtual InputConfig* GetConfig() const = 0;
+
   virtual void LoadDefaults(const ControllerInterface& ciface);
 
   virtual void LoadConfig(Common::IniFile::Section* sec, const std::string& base = "");