diff options
| author |  bunnei | 2018-05-23 20:50:12 -0400 |
|---|---|---|
| committer |  GitHub | 2018-05-23 20:50:12 -0400 |
| commit | 6b6287dda05d071f387be3ba2566f7e8fb58c2cc (patch) | |
| tree | 13e721f5fd2dee0a83855dd9225263bcb449162c /src/core | |
| parent | Merge pull request #460 from greggameplayer/patch-6 (diff) | |
| parent | Fix deadlocks caused from HID having too many layouts (diff) | |
| download | yuzu-6b6287dda05d071f387be3ba2566f7e8fb58c2cc.tar.gz yuzu-6b6287dda05d071f387be3ba2566f7e8fb58c2cc.tar.xz yuzu-6b6287dda05d071f387be3ba2566f7e8fb58c2cc.zip | |
Merge pull request #462 from ogniK5377/hid-fix
Fix deadlocks caused from HID having too many layouts
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/hid/hid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index b499308d6..15eee8f01 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h | |||
| @@ -12,7 +12,7 @@ namespace Service::HID { | |||
| 12 | // Begin enums and output structs | 12 | // Begin enums and output structs |
| 13 | 13 | ||
| 14 | constexpr u32 HID_NUM_ENTRIES = 17; | 14 | constexpr u32 HID_NUM_ENTRIES = 17; |
| 15 | constexpr u32 HID_NUM_LAYOUTS = 7; | 15 | constexpr u32 HID_NUM_LAYOUTS = 2; |
| 16 | constexpr s32 HID_JOYSTICK_MAX = 0x8000; | 16 | constexpr s32 HID_JOYSTICK_MAX = 0x8000; |
| 17 | constexpr s32 HID_JOYSTICK_MIN = -0x8000; | 17 | constexpr s32 HID_JOYSTICK_MIN = -0x8000; |
| 18 | 18 | ||