diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/controllers/console_sixaxis.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/console_sixaxis.h | 4 |
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() { | |||
| 77 | Input::CreateDevice<Input::MotionDevice>); | 77 | Input::CreateDevice<Input::MotionDevice>); |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | void Controller_ConsoleSixAxis::SetTransferMemoryPointer(u8* t_mem_1) { | 80 | void Controller_ConsoleSixAxis::SetTransferMemoryPointer(u8* t_mem) { |
| 81 | is_transfer_memory_set = true; | 81 | is_transfer_memory_set = true; |
| 82 | transfer_memory = t_mem_1; | 82 | transfer_memory = t_mem; |
| 83 | }; | 83 | } |
| 84 | 84 | ||
| 85 | void Controller_ConsoleSixAxis::ResetTimestamp() { | 85 | void Controller_ConsoleSixAxis::ResetTimestamp() { |
| 86 | auto& cur_entry = seven_six_axis.sevensixaxis_states[seven_six_axis.header.last_entry_index]; | 86 | 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: | |||
| 30 | void OnLoadInputDevices() override; | 30 | void OnLoadInputDevices() override; |
| 31 | 31 | ||
| 32 | // Called on InitializeSevenSixAxisSensor | 32 | // Called on InitializeSevenSixAxisSensor |
| 33 | void SetTransferMemoryPointer(u8* t_mem_1); | 33 | void SetTransferMemoryPointer(u8* t_mem); |
| 34 | 34 | ||
| 35 | // Called on ResetSevenSixAxisSensorTimestamp | 35 | // Called on ResetSevenSixAxisSensorTimestamp |
| 36 | void ResetTimestamp(); | 36 | void ResetTimestamp(); |
| @@ -71,8 +71,8 @@ private: | |||
| 71 | 71 | ||
| 72 | using MotionArray = | 72 | using MotionArray = |
| 73 | std::array<std::unique_ptr<Input::MotionDevice>, Settings::NativeMotion::NUM_MOTIONS_HID>; | 73 | std::array<std::unique_ptr<Input::MotionDevice>, Settings::NativeMotion::NUM_MOTIONS_HID>; |
| 74 | u8* transfer_memory; | ||
| 75 | MotionArray motions; | 74 | MotionArray motions; |
| 75 | u8* transfer_memory = nullptr; | ||
| 76 | bool is_transfer_memory_set = false; | 76 | bool is_transfer_memory_set = false; |
| 77 | ConsoleSharedMemory console_six_axis{}; | 77 | ConsoleSharedMemory console_six_axis{}; |
| 78 | SevenSixAxisMemory seven_six_axis{}; | 78 | SevenSixAxisMemory seven_six_axis{}; |