summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Ameer2020-06-21 15:31:57 -0400
committerGravatar Ameer2020-06-21 15:31:57 -0400
commitc94583d867fd909d8731ba50e085352aae0e6885 (patch)
tree9c691c1382d3317f45ad09cb43a93f9223fe379b /src/core
parentCleanup after linter (diff)
downloadyuzu-c94583d867fd909d8731ba50e085352aae0e6885.tar.gz
yuzu-c94583d867fd909d8731ba50e085352aae0e6885.tar.xz
yuzu-c94583d867fd909d8731ba50e085352aae0e6885.zip
Clang Formatting
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp42
1 files changed, 16 insertions, 26 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index d92325cb5..c55d900e2 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -44,7 +44,7 @@ static Controller_NPad::NPadControllerType MapSettingsTypeToNPad(Settings::Contr
44 case Settings::ControllerType::RightJoycon: 44 case Settings::ControllerType::RightJoycon:
45 return Controller_NPad::NPadControllerType::JoyRight; 45 return Controller_NPad::NPadControllerType::JoyRight;
46 default: 46 default:
47 UNREACHABLE(); 47 UNREACHABLE();
48 return Controller_NPad::NPadControllerType::JoyDual; 48 return Controller_NPad::NPadControllerType::JoyDual;
49 } 49 }
50} 50}
@@ -93,10 +93,7 @@ u32 Controller_NPad::IndexToNPad(std::size_t index) {
93 }; 93 };
94} 94}
95 95
96Controller_NPad::Controller_NPad(Core::System& system) 96Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system), system(system) {}
97 : ControllerBase(system), system(system) {
98}
99
100Controller_NPad::~Controller_NPad() = default; 97Controller_NPad::~Controller_NPad() = default;
101 98
102void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) { 99void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
@@ -109,7 +106,7 @@ void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
109 controller.device_type.raw = 0; 106 controller.device_type.raw = 0;
110 switch (controller_type) { 107 switch (controller_type) {
111 case NPadControllerType::None: 108 case NPadControllerType::None:
112 UNREACHABLE(); 109 UNREACHABLE();
113 break; 110 break;
114 case NPadControllerType::Handheld: 111 case NPadControllerType::Handheld:
115 controller.joy_styles.handheld.Assign(1); 112 controller.joy_styles.handheld.Assign(1);
@@ -197,8 +194,7 @@ void Controller_NPad::OnInit() {
197 194
198 std::transform( 195 std::transform(
199 Settings::values.players.begin(), Settings::values.players.end(), 196 Settings::values.players.begin(), Settings::values.players.end(),
200 connected_controllers.begin(), [](const Settings::PlayerInput& player) 197 connected_controllers.begin(), [](const Settings::PlayerInput& player) {
201 {
202 return ControllerHolder{MapSettingsTypeToNPad(player.type), player.connected}; 198 return ControllerHolder{MapSettingsTypeToNPad(player.type), player.connected};
203 }); 199 });
204 200
@@ -242,8 +238,7 @@ void Controller_NPad::OnLoadInputDevices() {
242 } 238 }
243} 239}
244 240
245void Controller_NPad::OnRelease() { 241void Controller_NPad::OnRelease() {}
246}
247 242
248void Controller_NPad::RequestPadStateUpdate(u32 npad_id) { 243void Controller_NPad::RequestPadStateUpdate(u32 npad_id) {
249 const auto controller_idx = NPadIdToIndex(npad_id); 244 const auto controller_idx = NPadIdToIndex(npad_id);
@@ -281,31 +276,27 @@ void Controller_NPad::RequestPadStateUpdate(u32 npad_id) {
281 pad_state.d_down.Assign(button_state[DDown - BUTTON_HID_BEGIN]->GetStatus()); 276 pad_state.d_down.Assign(button_state[DDown - BUTTON_HID_BEGIN]->GetStatus());
282 277
283 pad_state.l_stick_right.Assign( 278 pad_state.l_stick_right.Assign(
284 analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]-> 279 analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetAnalogDirectionStatus(
285 GetAnalogDirectionStatus(
286 Input::AnalogDirection::RIGHT)); 280 Input::AnalogDirection::RIGHT));
287 pad_state.l_stick_left.Assign( 281 pad_state.l_stick_left.Assign(
288 analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]-> 282 analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetAnalogDirectionStatus(
289 GetAnalogDirectionStatus(
290 Input::AnalogDirection::LEFT)); 283 Input::AnalogDirection::LEFT));
291 pad_state.l_stick_up.Assign( 284 pad_state.l_stick_up.Assign(
292 analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]-> 285 analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetAnalogDirectionStatus(
293 GetAnalogDirectionStatus(
294 Input::AnalogDirection::UP)); 286 Input::AnalogDirection::UP));
295 pad_state.l_stick_down.Assign( 287 pad_state.l_stick_down.Assign(
296 analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]-> 288 analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetAnalogDirectionStatus(
297 GetAnalogDirectionStatus(
298 Input::AnalogDirection::DOWN)); 289 Input::AnalogDirection::DOWN));
299 290
300 pad_state.r_stick_right.Assign( 291 pad_state.r_stick_right.Assign(
301 analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)] 292 analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]
302 ->GetAnalogDirectionStatus(Input::AnalogDirection::RIGHT)); 293 ->GetAnalogDirectionStatus(Input::AnalogDirection::RIGHT));
303 pad_state.r_stick_left.Assign(analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)] 294 pad_state.r_stick_left.Assign(analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]
304 ->GetAnalogDirectionStatus(Input::AnalogDirection::LEFT)); 295 ->GetAnalogDirectionStatus(Input::AnalogDirection::LEFT));
305 pad_state.r_stick_up.Assign(analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)] 296 pad_state.r_stick_up.Assign(analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]
306 ->GetAnalogDirectionStatus(Input::AnalogDirection::UP)); 297 ->GetAnalogDirectionStatus(Input::AnalogDirection::UP));
307 pad_state.r_stick_down.Assign(analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)] 298 pad_state.r_stick_down.Assign(analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]
308 ->GetAnalogDirectionStatus(Input::AnalogDirection::DOWN)); 299 ->GetAnalogDirectionStatus(Input::AnalogDirection::DOWN));
309 300
310 pad_state.left_sl.Assign(button_state[SL - BUTTON_HID_BEGIN]->GetStatus()); 301 pad_state.left_sl.Assign(button_state[SL - BUTTON_HID_BEGIN]->GetStatus());
311 pad_state.left_sr.Assign(button_state[SR - BUTTON_HID_BEGIN]->GetStatus()); 302 pad_state.left_sr.Assign(button_state[SR - BUTTON_HID_BEGIN]->GetStatus());
@@ -372,7 +363,7 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
372 363
373 switch (controller_type) { 364 switch (controller_type) {
374 case NPadControllerType::None: 365 case NPadControllerType::None:
375 UNREACHABLE(); 366 UNREACHABLE();
376 break; 367 break;
377 case NPadControllerType::Handheld: 368 case NPadControllerType::Handheld:
378 handheld_entry.connection_status.raw = 0; 369 handheld_entry.connection_status.raw = 0;
@@ -468,9 +459,8 @@ void Controller_NPad::SetSupportedNPadIdTypes(u8* data, std::size_t length) {
468 continue; 459 continue;
469 } 460 }
470 const auto requested_controller = 461 const auto requested_controller =
471 i <= MAX_NPAD_ID 462 i <= MAX_NPAD_ID ? MapSettingsTypeToNPad(Settings::values.players[i].type)
472 ? MapSettingsTypeToNPad(Settings::values.players[i].type) 463 : NPadControllerType::Handheld;
473 : NPadControllerType::Handheld;
474 if (!IsControllerSupported(requested_controller)) { 464 if (!IsControllerSupported(requested_controller)) {
475 const auto is_handheld = requested_controller == NPadControllerType::Handheld; 465 const auto is_handheld = requested_controller == NPadControllerType::Handheld;
476 if (is_handheld) { 466 if (is_handheld) {