INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-07-01 14:28:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

hid:StartLrAssignmentMode, hid:StopLrAssignmentMode, hid:SwapNpadAssignment

Browse Source 
StartLrAssignmentMode and StopLrAssignmentMode don't require any implementation as it's just used for showing the screen of changing the controller orientation if the user wishes to do so.  Ever since #1634 this has not been needed as users can specify the controller orientation from the config and swap at any time. We store a private member just in case this gets used for anything extra in the future
This commit is contained in:
David Marcec
2019-07-01 15:12:57 +10:00
parent d992909636
commit 472210bf72
6 changed files with 99 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/hle/service/hid/controllers/npad.cpp
View File

@ -548,6 +548,36 @@ void Controller_NPad::DisconnectNPad(u32 npad_id) {
connected_controllers[NPadIdToIndex(npad_id)].is_connected = false;
}
void Controller_NPad::StartLRAssignmentMode() {
// Nothing internally is used for lr assignment mode. Since we have the ability to set the
// controller types from boot, it doesn't really matter about showing a selection screen
is_in_lr_assignment_mode = true;
}
void Controller_NPad::StopLRAssignmentMode() {
is_in_lr_assignment_mode = false;
}
bool Controller_NPad::SwapNpadAssignment(u32 npad_id_1, u32 npad_id_2) {
if (npad_id_1 == NPAD_HANDHELD || npad_id_2 == NPAD_HANDHELD || npad_id_1 == NPAD_UNKNOWN ||
npad_id_2 == NPAD_UNKNOWN) {
return true;
}
if (!IsControllerSupported(connected_controllers[NPadIdToIndex(npad_id_1)].type) ||
!IsControllerSupported(connected_controllers[NPadIdToIndex(npad_id_2)].type)) {
return false;
}
std::swap(connected_controllers[NPadIdToIndex(npad_id_1)].type,
connected_controllers[NPadIdToIndex(npad_id_2)].type);
InitNewlyAddedControler(NPadIdToIndex(npad_id_1));
InitNewlyAddedControler(NPadIdToIndex(npad_id_2));
return true;
}
bool Controller_NPad::IsControllerSupported(NPadControllerType controller) {
if (controller == NPadControllerType::Handheld) {
// Handheld is not even a supported type, lets stop here

5
src/core/hle/service/hid/controllers/npad.h
View File

@ -124,6 +124,10 @@ public:
void ConnectAllDisconnectedControllers();
void ClearAllControllers();
void StartLRAssignmentMode();
void StopLRAssignmentMode();
bool SwapNpadAssignment(u32 npad_id_1, u32 npad_id_2);
// Logical OR for all buttons presses on all controllers
// Specifically for cheat engine and other features.
u32 GetAndResetPressState();
@ -321,5 +325,6 @@ private:
void RequestPadStateUpdate(u32 npad_id);
std::array<ControllerPad, 10> npad_pad_states{};
bool IsControllerSupported(NPadControllerType controller);
bool is_in_lr_assignment_mode{false};
};
} // namespace Service::HID