diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-08-21 13:49:22 +0200 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-08-26 08:32:32 +0200 |
| commit | 334ef2efdd54731c81f16b883413cb5cf33e481c (patch) | |
| tree | 701ac2872f2f727832987d64e4cc587b8a74956b /src/core | |
| parent | controllers/npad: Fix LedPattern for P1-4 (diff) | |
| download | yuzu-334ef2efdd54731c81f16b883413cb5cf33e481c.tar yuzu-334ef2efdd54731c81f16b883413cb5cf33e481c.tar.gz yuzu-334ef2efdd54731c81f16b883413cb5cf33e481c.tar.bz2 yuzu-334ef2efdd54731c81f16b883413cb5cf33e481c.tar.lz yuzu-334ef2efdd54731c81f16b883413cb5cf33e481c.tar.xz yuzu-334ef2efdd54731c81f16b883413cb5cf33e481c.tar.zst yuzu-334ef2efdd54731c81f16b883413cb5cf33e481c.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 365db4134..d7ca07b7c 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -375,6 +375,7 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* auto& libnx_entry = npad.libnx.npad[npad.libnx.common.last_entry_index]; libnx_entry.connection_status.raw = 0; + libnx_entry.connection_status.IsConnected.Assign(1); switch (controller_type) { case NPadControllerType::None: @@ -387,6 +388,8 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* main_controller.pad.pad_states.raw = pad_state.pad_states.raw; main_controller.pad.l_stick = pad_state.l_stick; main_controller.pad.r_stick = pad_state.r_stick; + + libnx_entry.connection_status.IsWired.Assign(1); break; case NPadControllerType::Handheld: handheld_entry.connection_status.raw = 0; @@ -398,6 +401,12 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* handheld_entry.pad.pad_states.raw = pad_state.pad_states.raw; handheld_entry.pad.l_stick = pad_state.l_stick; handheld_entry.pad.r_stick = pad_state.r_stick; + + libnx_entry.connection_status.IsWired.Assign(1); + libnx_entry.connection_status.IsLeftJoyConnected.Assign(1); + libnx_entry.connection_status.IsRightJoyConnected.Assign(1); + libnx_entry.connection_status.IsLeftJoyWired.Assign(1); + libnx_entry.connection_status.IsRightJoyWired.Assign(1); break; case NPadControllerType::JoyDual: dual_entry.connection_status.raw = 0; @@ -408,7 +417,6 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* dual_entry.pad.l_stick = pad_state.l_stick; dual_entry.pad.r_stick = pad_state.r_stick; - libnx_entry.connection_status.IsConnected.Assign(1); libnx_entry.connection_status.IsLeftJoyConnected.Assign(1); libnx_entry.connection_status.IsRightJoyConnected.Assign(1); break; |