summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-04-27 05:07:16 +0200
committergerman77 <juangerman-13@hotmail.com>2021-04-27 05:07:16 +0200
commitcfdec68d5a8001453fbd49e9677f00ea3dfa9bcb (patch)
tree2db1743e3c26f6a8667c650e729b98c6661785a9
parenthid: Implement SevenSixAxis and ConsoleSixAxisSensor (diff)
downloadyuzu-cfdec68d5a8001453fbd49e9677f00ea3dfa9bcb.tar
yuzu-cfdec68d5a8001453fbd49e9677f00ea3dfa9bcb.tar.gz
yuzu-cfdec68d5a8001453fbd49e9677f00ea3dfa9bcb.tar.bz2
yuzu-cfdec68d5a8001453fbd49e9677f00ea3dfa9bcb.tar.lz
yuzu-cfdec68d5a8001453fbd49e9677f00ea3dfa9bcb.tar.xz
yuzu-cfdec68d5a8001453fbd49e9677f00ea3dfa9bcb.tar.zst
yuzu-cfdec68d5a8001453fbd49e9677f00ea3dfa9bcb.zip
-rw-r--r--src/core/hle/service/hid/controllers/console_sixaxis.cpp6
-rw-r--r--src/core/hle/service/hid/controllers/console_sixaxis.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.cpp b/src/core/hle/service/hid/controllers/console_sixaxis.cpp
index 801e14b79..913768fab 100644
--- a/src/core/hle/service/hid/controllers/console_sixaxis.cpp
+++ b/src/core/hle/service/hid/controllers/console_sixaxis.cpp
@@ -77,10 +77,10 @@ void Controller_ConsoleSixAxis::OnLoadInputDevices() {
Input::CreateDevice<Input::MotionDevice>);
}
-void Controller_ConsoleSixAxis::SetTransferMemoryPointer(u8* t_mem_1) {
+void Controller_ConsoleSixAxis::SetTransferMemoryPointer(u8* t_mem) {
is_transfer_memory_set = true;
- transfer_memory = t_mem_1;
-};
+ transfer_memory = t_mem;
+}
void Controller_ConsoleSixAxis::ResetTimestamp() {
auto& cur_entry = seven_six_axis.sevensixaxis_states[seven_six_axis.header.last_entry_index];
diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.h b/src/core/hle/service/hid/controllers/console_sixaxis.h
index ac0501683..1fae98e94 100644
--- a/src/core/hle/service/hid/controllers/console_sixaxis.h
+++ b/src/core/hle/service/hid/controllers/console_sixaxis.h
@@ -30,7 +30,7 @@ public:
void OnLoadInputDevices() override;
// Called on InitializeSevenSixAxisSensor
- void SetTransferMemoryPointer(u8* t_mem_1);
+ void SetTransferMemoryPointer(u8* t_mem);
// Called on ResetSevenSixAxisSensorTimestamp
void ResetTimestamp();
@@ -71,8 +71,8 @@ private:
using MotionArray =
std::array<std::unique_ptr<Input::MotionDevice>, Settings::NativeMotion::NUM_MOTIONS_HID>;
- u8* transfer_memory;
MotionArray motions;
+ u8* transfer_memory = nullptr;
bool is_transfer_memory_set = false;
ConsoleSharedMemory console_six_axis{};
SevenSixAxisMemory seven_six_axis{};