summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index d7ca07b7c..45fde8df2 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -393,6 +393,7 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
393 break; 393 break;
394 case NPadControllerType::Handheld: 394 case NPadControllerType::Handheld:
395 handheld_entry.connection_status.raw = 0; 395 handheld_entry.connection_status.raw = 0;
396 handheld_entry.connection_status.IsConnected.Assign(1);
396 handheld_entry.connection_status.IsWired.Assign(1); 397 handheld_entry.connection_status.IsWired.Assign(1);
397 handheld_entry.connection_status.IsLeftJoyConnected.Assign(1); 398 handheld_entry.connection_status.IsLeftJoyConnected.Assign(1);
398 handheld_entry.connection_status.IsRightJoyConnected.Assign(1); 399 handheld_entry.connection_status.IsRightJoyConnected.Assign(1);
@@ -423,21 +424,26 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
423 case NPadControllerType::JoyLeft: 424 case NPadControllerType::JoyLeft:
424 left_entry.connection_status.raw = 0; 425 left_entry.connection_status.raw = 0;
425 left_entry.connection_status.IsConnected.Assign(1); 426 left_entry.connection_status.IsConnected.Assign(1);
427 left_entry.connection_status.IsLeftJoyConnected.Assign(1);
426 left_entry.pad.pad_states.raw = pad_state.pad_states.raw; 428 left_entry.pad.pad_states.raw = pad_state.pad_states.raw;
427 left_entry.pad.l_stick = pad_state.l_stick; 429 left_entry.pad.l_stick = pad_state.l_stick;
428 left_entry.pad.r_stick = pad_state.r_stick; 430 left_entry.pad.r_stick = pad_state.r_stick;
431
432 libnx_entry.connection_status.IsLeftJoyConnected.Assign(1);
429 break; 433 break;
430 case NPadControllerType::JoyRight: 434 case NPadControllerType::JoyRight:
431 right_entry.connection_status.raw = 0; 435 right_entry.connection_status.raw = 0;
432 right_entry.connection_status.IsConnected.Assign(1); 436 right_entry.connection_status.IsConnected.Assign(1);
437 right_entry.connection_status.IsRightJoyConnected.Assign(1);
433 right_entry.pad.pad_states.raw = pad_state.pad_states.raw; 438 right_entry.pad.pad_states.raw = pad_state.pad_states.raw;
434 right_entry.pad.l_stick = pad_state.l_stick; 439 right_entry.pad.l_stick = pad_state.l_stick;
435 right_entry.pad.r_stick = pad_state.r_stick; 440 right_entry.pad.r_stick = pad_state.r_stick;
441
442 libnx_entry.connection_status.IsRightJoyConnected.Assign(1);
436 break; 443 break;
437 case NPadControllerType::Pokeball: 444 case NPadControllerType::Pokeball:
438 pokeball_entry.connection_status.raw = 0; 445 pokeball_entry.connection_status.raw = 0;
439 pokeball_entry.connection_status.IsConnected.Assign(1); 446 pokeball_entry.connection_status.IsConnected.Assign(1);
440 pokeball_entry.connection_status.IsWired.Assign(1);
441 pokeball_entry.pad.pad_states.raw = pad_state.pad_states.raw; 447 pokeball_entry.pad.pad_states.raw = pad_state.pad_states.raw;
442 pokeball_entry.pad.l_stick = pad_state.l_stick; 448 pokeball_entry.pad.l_stick = pad_state.l_stick;
443 pokeball_entry.pad.r_stick = pad_state.r_stick; 449 pokeball_entry.pad.r_stick = pad_state.r_stick;