prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Limit setting hold types to either vertical and horizontal

Browse Source 
Apparently some games throw bad values for this, does not look like any error codes are in place from what I can see, will need to investigate further to see why games try this.
This commit is contained in:
David Marcec
2018-12-19 13:48:15 +11:00
parent 39262921f2
commit ed53ab9cd9
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,11 +512,21 @@ std::size_t Controller_NPad::GetSupportedNPadIdTypesSize() const {
void Controller_NPad::SetHoldType(NpadHoldType joy_hold_type) { void Controller_NPad::SetHoldType(NpadHoldType joy_hold_type) {
styleset_changed_event.writable->Signal(); styleset_changed_event.writable->Signal();
hold_type = joy_hold_type; if (joy_hold_type < NpadHoldType::HoldType_Max) {
hold_type = joy_hold_type;
} else {
LOG_WARNING(Service_HID, "got bad hold type={}", static_cast<u64>(joy_hold_type));
}
} }
Controller_NPad::NpadHoldType Controller_NPad::GetHoldType() const { Controller_NPad::NpadHoldType Controller_NPad::GetHoldType() const {
return hold_type; if (hold_type < NpadHoldType::HoldType_Max) {
return hold_type;
} else {
LOG_WARNING(Service_HID, "has bad stored hold_type={}, defaulting to vertical",
static_cast<u64>(hold_type));
return NpadHoldType::Vertical;
}
} }
void Controller_NPad::SetNpadMode(u32 npad_id, NPadAssignments assignment_mode) { void Controller_NPad::SetNpadMode(u32 npad_id, NPadAssignments assignment_mode) {

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

@@ -61,6 +61,7 @@ public:
enum class NpadHoldType : u64 { enum class NpadHoldType : u64 {
Vertical = 0, Vertical = 0,
Horizontal = 1, Horizontal = 1,
HoldType_Max = 2,
}; };
enum class NPadAssignments : u32_le { enum class NPadAssignments : u32_le {