diff options
| author | bunnei <bunneidev@gmail.com> | 2018-06-12 15:07:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 15:07:38 +0200 |
| commit | 33dbf24b5660a17d820d613efaf19c6427224b7f (patch) | |
| tree | 09b098f55511dcb44de2bd922110d05691590a9f /src | |
| parent | Merge pull request #552 from bunnei/sat-fmul (diff) | |
| parent | hid: Update all layouts and only show handheld as connected, fixes libnx input for P1_AUTO (diff) | |
| download | yuzu-33dbf24b5660a17d820d613efaf19c6427224b7f.tar yuzu-33dbf24b5660a17d820d613efaf19c6427224b7f.tar.gz yuzu-33dbf24b5660a17d820d613efaf19c6427224b7f.tar.bz2 yuzu-33dbf24b5660a17d820d613efaf19c6427224b7f.tar.lz yuzu-33dbf24b5660a17d820d613efaf19c6427224b7f.tar.xz yuzu-33dbf24b5660a17d820d613efaf19c6427224b7f.tar.zst yuzu-33dbf24b5660a17d820d613efaf19c6427224b7f.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 00c5308ba..85ca4bf06 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -94,7 +94,6 @@ private: layout.header.latest_entry = (layout.header.latest_entry + 1) % HID_NUM_ENTRIES; ControllerInputEntry& entry = layout.entries[layout.header.latest_entry]; - entry.connection_state = ConnectionState_Connected | ConnectionState_Wired; entry.timestamp++; // TODO(shinyquagsire23): Is this always identical to timestamp? entry.timestamp_2++; @@ -103,6 +102,8 @@ private: if (controller != Controller_Handheld) continue; + entry.connection_state = ConnectionState_Connected | ConnectionState_Wired; + // TODO(shinyquagsire23): Set up some LUTs for each layout mapping in the future? // For now everything is just the default handheld layout, but split Joy-Con will // rotate the face buttons and directions for certain layouts. diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index 15eee8f01..b499308d6 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -12,7 +12,7 @@ namespace Service::HID { // Begin enums and output structs constexpr u32 HID_NUM_ENTRIES = 17; -constexpr u32 HID_NUM_LAYOUTS = 2; +constexpr u32 HID_NUM_LAYOUTS = 7; constexpr s32 HID_JOYSTICK_MAX = 0x8000; constexpr s32 HID_JOYSTICK_MIN = -0x8000; |