summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorshinyquagsire23 <mtinc2@gmail.com>2018-06-12 03:41:29 +0200
committershinyquagsire23 <mtinc2@gmail.com>2018-06-12 03:41:29 +0200
commit2f9c0e7c7e0238cdcf241d4348b6e3c17c3a3e48 (patch)
treeeff3ca71ff5448e754f6b7611ff6e3de455e69a3 /src/core/hle/service
parentMerge pull request #555 from Subv/gpu_sysregs (diff)
downloadyuzu-2f9c0e7c7e0238cdcf241d4348b6e3c17c3a3e48.tar
yuzu-2f9c0e7c7e0238cdcf241d4348b6e3c17c3a3e48.tar.gz
yuzu-2f9c0e7c7e0238cdcf241d4348b6e3c17c3a3e48.tar.bz2
yuzu-2f9c0e7c7e0238cdcf241d4348b6e3c17c3a3e48.tar.lz
yuzu-2f9c0e7c7e0238cdcf241d4348b6e3c17c3a3e48.tar.xz
yuzu-2f9c0e7c7e0238cdcf241d4348b6e3c17c3a3e48.tar.zst
yuzu-2f9c0e7c7e0238cdcf241d4348b6e3c17c3a3e48.zip
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/hid/hid.cpp3
-rw-r--r--src/core/hle/service/hid/hid.h2
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;