diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2024-01-01 22:23:56 +0100 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2024-01-04 03:21:14 +0100 |
commit | 6a244465cef86d7329f12dd1dfd5d6fdd415a0ed (patch) | |
tree | 0b69faca9aee4ab31705d07d57e55a75b1b2a809 /src/core/hle/service/hid/controllers/types | |
parent | Merge pull request #12554 from german77/directconnect (diff) | |
download | yuzu-6a244465cef86d7329f12dd1dfd5d6fdd415a0ed.tar yuzu-6a244465cef86d7329f12dd1dfd5d6fdd415a0ed.tar.gz yuzu-6a244465cef86d7329f12dd1dfd5d6fdd415a0ed.tar.bz2 yuzu-6a244465cef86d7329f12dd1dfd5d6fdd415a0ed.tar.lz yuzu-6a244465cef86d7329f12dd1dfd5d6fdd415a0ed.tar.xz yuzu-6a244465cef86d7329f12dd1dfd5d6fdd415a0ed.tar.zst yuzu-6a244465cef86d7329f12dd1dfd5d6fdd415a0ed.zip |
Diffstat (limited to 'src/core/hle/service/hid/controllers/types')
-rw-r--r-- | src/core/hle/service/hid/controllers/types/npad_types.h | 3 | ||||
-rw-r--r-- | src/core/hle/service/hid/controllers/types/shared_memory_format.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/types/npad_types.h b/src/core/hle/service/hid/controllers/types/npad_types.h index a5ce2562b..419c33a8c 100644 --- a/src/core/hle/service/hid/controllers/types/npad_types.h +++ b/src/core/hle/service/hid/controllers/types/npad_types.h @@ -9,7 +9,8 @@ #include "core/hid/hid_types.h" namespace Service::HID { -static constexpr std::size_t NpadCount = 10; +static constexpr std::size_t MaxSupportedNpadIdTypes = 10; +static constexpr std::size_t StyleIndexCount = 7; // This is nn::hid::NpadJoyHoldType enum class NpadJoyHoldType : u64 { diff --git a/src/core/hle/service/hid/controllers/types/shared_memory_format.h b/src/core/hle/service/hid/controllers/types/shared_memory_format.h index 2986c113e..976043b9c 100644 --- a/src/core/hle/service/hid/controllers/types/shared_memory_format.h +++ b/src/core/hle/service/hid/controllers/types/shared_memory_format.h @@ -171,7 +171,7 @@ static_assert(sizeof(NpadSharedMemoryEntry) == 0x5000, "NpadSharedMemoryEntry is // This is nn::hid::detail::NpadSharedMemoryFormat struct NpadSharedMemoryFormat { - std::array<NpadSharedMemoryEntry, NpadCount> npad_entry; + std::array<NpadSharedMemoryEntry, MaxSupportedNpadIdTypes> npad_entry; }; static_assert(sizeof(NpadSharedMemoryFormat) == 0x32000, "NpadSharedMemoryFormat is an invalid size"); |