Deglobalize System: Hid

src/core/hle/service/hid/controllers/controller_base.cpp

@@ -9,12 +9,12 @@ namespace Service::HID {
 ControllerBase::ControllerBase() = default;
 ControllerBase::~ControllerBase() = default;
 
-void ControllerBase::ActivateController() {
+void ControllerBase::ActivateController(Core::System& system) {
     if (is_activated) {
         OnRelease();
     }
     is_activated = true;
-    OnInit();
+    OnInit(system);
 }
 
 void ControllerBase::DeactivateController() {

src/core/hle/service/hid/controllers/controller_base.h

@@ -11,6 +11,10 @@ namespace Core::Timing {
 class CoreTiming;
 }
 
+namespace Core {
+class System;
+}
+
 namespace Service::HID {
 class ControllerBase {
 public:
@@ -18,7 +22,7 @@ public:
     virtual ~ControllerBase();
 
     // Called when the controller is initialized
-    virtual void OnInit() = 0;
+    virtual void OnInit(Core::System& system) = 0;
 
     // When the controller is released
     virtual void OnRelease() = 0;
@@ -30,7 +34,7 @@ public:
     // Called when input devices should be loaded
     virtual void OnLoadInputDevices() = 0;
 
-    void ActivateController();
+    void ActivateController(Core::System& system);
 
     void DeactivateController();
 

src/core/hle/service/hid/controllers/debug_pad.cpp

@@ -17,7 +17,7 @@ enum class JoystickId : std::size_t { Joystick_Left, Joystick_Right };
 Controller_DebugPad::Controller_DebugPad() = default;
 Controller_DebugPad::~Controller_DebugPad() = default;
 
-void Controller_DebugPad::OnInit() {}
+void Controller_DebugPad::OnInit(Core::System& system) {}
 
 void Controller_DebugPad::OnRelease() {}
 

src/core/hle/service/hid/controllers/debug_pad.h

@@ -20,7 +20,7 @@ public:
     ~Controller_DebugPad() override;
 
     // Called when the controller is initialized
-    void OnInit() override;
+    void OnInit(Core::System& system) override;
 
     // When the controller is released
     void OnRelease() override;

src/core/hle/service/hid/controllers/gesture.cpp

@@ -13,7 +13,7 @@ constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3BA00;
 Controller_Gesture::Controller_Gesture() = default;
 Controller_Gesture::~Controller_Gesture() = default;
 
-void Controller_Gesture::OnInit() {}
+void Controller_Gesture::OnInit(Core::System& system) {}
 
 void Controller_Gesture::OnRelease() {}
 

src/core/hle/service/hid/controllers/gesture.h

@@ -16,7 +16,7 @@ public:
     ~Controller_Gesture() override;
 
     // Called when the controller is initialized
-    void OnInit() override;
+    void OnInit(Core::System& system) override;
 
     // When the controller is released
     void OnRelease() override;

src/core/hle/service/hid/controllers/keyboard.cpp

@@ -15,7 +15,7 @@ constexpr u8 KEYS_PER_BYTE = 8;
 Controller_Keyboard::Controller_Keyboard() = default;
 Controller_Keyboard::~Controller_Keyboard() = default;
 
-void Controller_Keyboard::OnInit() {}
+void Controller_Keyboard::OnInit(Core::System& system) {}
 
 void Controller_Keyboard::OnRelease() {}
 

src/core/hle/service/hid/controllers/keyboard.h

@@ -19,7 +19,7 @@ public:
     ~Controller_Keyboard() override;
 
     // Called when the controller is initialized
-    void OnInit() override;
+    void OnInit(Core::System& system) override;
 
     // When the controller is released
     void OnRelease() override;

src/core/hle/service/hid/controllers/mouse.cpp

@@ -14,7 +14,7 @@ constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3400;
 Controller_Mouse::Controller_Mouse() = default;
 Controller_Mouse::~Controller_Mouse() = default;
 
-void Controller_Mouse::OnInit() {}
+void Controller_Mouse::OnInit(Core::System& system) {}
 void Controller_Mouse::OnRelease() {}
 
 void Controller_Mouse::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data,

src/core/hle/service/hid/controllers/mouse.h

@@ -18,7 +18,7 @@ public:
     ~Controller_Mouse() override;
 
     // Called when the controller is initialized
-    void OnInit() override;
+    void OnInit(Core::System& system) override;
 
     // When the controller is released
     void OnRelease() override;

src/core/hle/service/hid/controllers/npad.cpp

@@ -167,8 +167,8 @@ void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
     controller.battery_level[2] = BATTERY_FULL;
 }
 
-void Controller_NPad::OnInit() {
-    auto& kernel = Core::System::GetInstance().Kernel();
+void Controller_NPad::OnInit(Core::System& system) {
+    auto& kernel = system.Kernel();
     styleset_changed_event = Kernel::WritableEvent::CreateEventPair(
         kernel, Kernel::ResetType::Automatic, "npad:NpadStyleSetChanged");
 

src/core/hle/service/hid/controllers/npad.h

@@ -24,7 +24,7 @@ public:
     ~Controller_NPad() override;
 
     // Called when the controller is initialized
-    void OnInit() override;
+    void OnInit(Core::System& system) override;
 
     // When the controller is released
     void OnRelease() override;

src/core/hle/service/hid/controllers/stubbed.cpp

@@ -12,7 +12,7 @@ namespace Service::HID {
 Controller_Stubbed::Controller_Stubbed() = default;
 Controller_Stubbed::~Controller_Stubbed() = default;
 
-void Controller_Stubbed::OnInit() {}
+void Controller_Stubbed::OnInit(Core::System& system) {}
 
 void Controller_Stubbed::OnRelease() {}
 

src/core/hle/service/hid/controllers/stubbed.h

@@ -14,7 +14,7 @@ public:
     ~Controller_Stubbed() override;
 
     // Called when the controller is initialized
-    void OnInit() override;
+    void OnInit(Core::System& system) override;
 
     // When the controller is released
     void OnRelease() override;

src/core/hle/service/hid/controllers/touchscreen.cpp

@@ -16,7 +16,7 @@ constexpr std::size_t SHARED_MEMORY_OFFSET = 0x400;
 Controller_Touchscreen::Controller_Touchscreen() = default;
 Controller_Touchscreen::~Controller_Touchscreen() = default;
 
-void Controller_Touchscreen::OnInit() {}
+void Controller_Touchscreen::OnInit(Core::System& system) {}
 
 void Controller_Touchscreen::OnRelease() {}
 

src/core/hle/service/hid/controllers/touchscreen.h

@@ -18,7 +18,7 @@ public:
     ~Controller_Touchscreen() override;
 
     // Called when the controller is initialized
-    void OnInit() override;
+    void OnInit(Core::System& system) override;
 
     // When the controller is released
     void OnRelease() override;

src/core/hle/service/hid/controllers/xpad.cpp

@@ -13,7 +13,7 @@ constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3C00;
 Controller_XPad::Controller_XPad() = default;
 Controller_XPad::~Controller_XPad() = default;
 
-void Controller_XPad::OnInit() {}
+void Controller_XPad::OnInit(Core::System& system) {}
 
 void Controller_XPad::OnRelease() {}
 

src/core/hle/service/hid/controllers/xpad.h

@@ -16,7 +16,7 @@ public:
     ~Controller_XPad() override;
 
     // Called when the controller is initialized
-    void OnInit() override;
+    void OnInit(Core::System& system) override;
 
     // When the controller is released
     void OnRelease() override;