8 files changed, 28 insertions, 26 deletions

diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.cpp b/src/core/hle/service/hid/hidbus/hidbus_base.cpp
index b569b3c20..dfd23ec04 100644
--- a/src/core/hle/service/hid/hidbus/hidbus_base.cpp
+++ b/src/core/hle/service/hid/hidbus/hidbus_base.cpp
@@ -9,8 +9,8 @@
 
 namespace Service::HID {
 
-HidbusBase::HidbusBase(KernelHelpers::ServiceContext& service_context_)
-    : service_context(service_context_) {
+HidbusBase::HidbusBase(Core::System& system_, KernelHelpers::ServiceContext& service_context_)
+    : system(system_), service_context(service_context_) {
     send_command_async_event = service_context.CreateEvent("hidbus:SendCommandAsyncEvent");
 }
 HidbusBase::~HidbusBase() = default;
@@ -59,8 +59,7 @@ void HidbusBase::DisablePollingMode() {
     polling_mode_enabled = false;
 }
 
-void HidbusBase::SetTransferMemoryPointer(u8* t_mem) {
-    is_transfer_memory_set = true;
+void HidbusBase::SetTransferMemoryAddress(VAddr t_mem) {
     transfer_memory = t_mem;
 }
 
diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.h b/src/core/hle/service/hid/hidbus/hidbus_base.h
index 65e301137..26313264d 100644
--- a/src/core/hle/service/hid/hidbus/hidbus_base.h
+++ b/src/core/hle/service/hid/hidbus/hidbus_base.h
@@ -8,6 +8,10 @@
 #include "common/common_types.h"
 #include "core/hle/result.h"
 
+namespace Core {
+class System;
+}
+
 namespace Kernel {
 class KEvent;
 class KReadableEvent;
@@ -106,7 +110,7 @@ static_assert(sizeof(ButtonOnlyPollingDataAccessor) == 0x2F0,
 
 class HidbusBase {
 public:
-    explicit HidbusBase(KernelHelpers::ServiceContext& service_context_);
+    explicit HidbusBase(Core::System& system_, KernelHelpers::ServiceContext& service_context_);
     virtual ~HidbusBase();
 
     void ActivateDevice();
@@ -134,7 +138,7 @@ public:
     void DisablePollingMode();
 
     // Called on EnableJoyPollingReceiveMode
-    void SetTransferMemoryPointer(u8* t_mem);
+    void SetTransferMemoryAddress(VAddr t_mem);
 
     Kernel::KReadableEvent& GetSendCommandAsycEvent() const;
 
@@ -170,9 +174,9 @@ protected:
     JoyEnableSixAxisDataAccessor enable_sixaxis_data{};
     ButtonOnlyPollingDataAccessor button_only_data{};
 
-    u8* transfer_memory{nullptr};
-    bool is_transfer_memory_set{};
+    VAddr transfer_memory{};
 
+    Core::System& system;
     Kernel::KEvent* send_command_async_event;
     KernelHelpers::ServiceContext& service_context;
 };
diff --git a/src/core/hle/service/hid/hidbus/ringcon.cpp b/src/core/hle/service/hid/hidbus/ringcon.cpp
index 35847cbdd..65a2dd521 100644
--- a/src/core/hle/service/hid/hidbus/ringcon.cpp
+++ b/src/core/hle/service/hid/hidbus/ringcon.cpp
@@ -1,18 +1,20 @@
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "core/core.h"
 #include "core/hid/emulated_controller.h"
 #include "core/hid/hid_core.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/service/hid/hidbus/ringcon.h"
+#include "core/memory.h"
 
 namespace Service::HID {
 
-RingController::RingController(Core::HID::HIDCore& hid_core_,
+RingController::RingController(Core::System& system_,
                                KernelHelpers::ServiceContext& service_context_)
-    : HidbusBase(service_context_) {
-    input = hid_core_.GetEmulatedController(Core::HID::NpadIdType::Player1);
+    : HidbusBase(system_, service_context_) {
+    input = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1);
 }
 
 RingController::~RingController() = default;
@@ -38,7 +40,7 @@ void RingController::OnUpdate() {
         return;
     }
 
-    if (!polling_mode_enabled || !is_transfer_memory_set) {
+    if (!polling_mode_enabled || transfer_memory == 0) {
         return;
     }
 
@@ -62,7 +64,8 @@ void RingController::OnUpdate() {
         curr_entry.polling_data.out_size = sizeof(ringcon_value);
         std::memcpy(curr_entry.polling_data.data.data(), &ringcon_value, sizeof(ringcon_value));
 
-        std::memcpy(transfer_memory, &enable_sixaxis_data, sizeof(enable_sixaxis_data));
+        system.Memory().WriteBlock(transfer_memory, &enable_sixaxis_data,
+                                   sizeof(enable_sixaxis_data));
         break;
     }
     default:
diff --git a/src/core/hle/service/hid/hidbus/ringcon.h b/src/core/hle/service/hid/hidbus/ringcon.h
index c2fb386b1..f42f3ea41 100644
--- a/src/core/hle/service/hid/hidbus/ringcon.h
+++ b/src/core/hle/service/hid/hidbus/ringcon.h
@@ -17,8 +17,7 @@ namespace Service::HID {
 
 class RingController final : public HidbusBase {
 public:
-    explicit RingController(Core::HID::HIDCore& hid_core_,
-                            KernelHelpers::ServiceContext& service_context_);
+    explicit RingController(Core::System& system_, KernelHelpers::ServiceContext& service_context_);
     ~RingController() override;
 
     void OnInit() override;
diff --git a/src/core/hle/service/hid/hidbus/starlink.cpp b/src/core/hle/service/hid/hidbus/starlink.cpp
index d0e760314..36573274e 100644
--- a/src/core/hle/service/hid/hidbus/starlink.cpp
+++ b/src/core/hle/service/hid/hidbus/starlink.cpp
@@ -8,8 +8,8 @@
 namespace Service::HID {
 constexpr u8 DEVICE_ID = 0x28;
 
-Starlink::Starlink(Core::HID::HIDCore& hid_core_, KernelHelpers::ServiceContext& service_context_)
-    : HidbusBase(service_context_) {}
+Starlink::Starlink(Core::System& system_, KernelHelpers::ServiceContext& service_context_)
+    : HidbusBase(system_, service_context_) {}
 Starlink::~Starlink() = default;
 
 void Starlink::OnInit() {
@@ -27,7 +27,7 @@ void Starlink::OnUpdate() {
     if (!device_enabled) {
         return;
     }
-    if (!polling_mode_enabled || !is_transfer_memory_set) {
+    if (!polling_mode_enabled || transfer_memory == 0) {
         return;
     }
 
diff --git a/src/core/hle/service/hid/hidbus/starlink.h b/src/core/hle/service/hid/hidbus/starlink.h
index 07c800e6e..a276aa88f 100644
--- a/src/core/hle/service/hid/hidbus/starlink.h
+++ b/src/core/hle/service/hid/hidbus/starlink.h
@@ -14,8 +14,7 @@ namespace Service::HID {
 
 class Starlink final : public HidbusBase {
 public:
-    explicit Starlink(Core::HID::HIDCore& hid_core_,
-                      KernelHelpers::ServiceContext& service_context_);
+    explicit Starlink(Core::System& system_, KernelHelpers::ServiceContext& service_context_);
     ~Starlink() override;
 
     void OnInit() override;
diff --git a/src/core/hle/service/hid/hidbus/stubbed.cpp b/src/core/hle/service/hid/hidbus/stubbed.cpp
index 07632c872..8160b7218 100644
--- a/src/core/hle/service/hid/hidbus/stubbed.cpp
+++ b/src/core/hle/service/hid/hidbus/stubbed.cpp
@@ -8,9 +8,8 @@
 namespace Service::HID {
 constexpr u8 DEVICE_ID = 0xFF;
 
-HidbusStubbed::HidbusStubbed(Core::HID::HIDCore& hid_core_,
-                             KernelHelpers::ServiceContext& service_context_)
-    : HidbusBase(service_context_) {}
+HidbusStubbed::HidbusStubbed(Core::System& system_, KernelHelpers::ServiceContext& service_context_)
+    : HidbusBase(system_, service_context_) {}
 HidbusStubbed::~HidbusStubbed() = default;
 
 void HidbusStubbed::OnInit() {
@@ -28,7 +27,7 @@ void HidbusStubbed::OnUpdate() {
     if (!device_enabled) {
         return;
     }
-    if (!polling_mode_enabled || !is_transfer_memory_set) {
+    if (!polling_mode_enabled || transfer_memory == 0) {
         return;
     }
 
diff --git a/src/core/hle/service/hid/hidbus/stubbed.h b/src/core/hle/service/hid/hidbus/stubbed.h
index 38eaa0ecc..2e58d42fc 100644
--- a/src/core/hle/service/hid/hidbus/stubbed.h
+++ b/src/core/hle/service/hid/hidbus/stubbed.h
@@ -14,8 +14,7 @@ namespace Service::HID {
 
 class HidbusStubbed final : public HidbusBase {
 public:
-    explicit HidbusStubbed(Core::HID::HIDCore& hid_core_,
-                           KernelHelpers::ServiceContext& service_context_);
+    explicit HidbusStubbed(Core::System& system_, KernelHelpers::ServiceContext& service_context_);
     ~HidbusStubbed() override;
 
     void OnInit() override;