mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 11:03:22 +02:00
service/hid: Rewrite npad to use ring lifo and the emulated controller
This commit is contained in:
parent
a2ad5762e6
commit
c87ad2d0d6
File diff suppressed because it is too large
Load Diff
@ -12,8 +12,10 @@
|
|||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/quaternion.h"
|
#include "common/quaternion.h"
|
||||||
#include "common/settings.h"
|
#include "common/settings.h"
|
||||||
#include "core/frontend/input.h"
|
#include "core/hid/hid_core.h"
|
||||||
|
#include "core/hid/hid_types.h"
|
||||||
#include "core/hle/service/hid/controllers/controller_base.h"
|
#include "core/hle/service/hid/controllers/controller_base.h"
|
||||||
|
#include "core/hle/service/hid/ring_lifo.h"
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
class KEvent;
|
class KEvent;
|
||||||
@ -48,31 +50,6 @@ public:
|
|||||||
void OnMotionUpdate(const Core::Timing::CoreTiming& core_timing, u8* data,
|
void OnMotionUpdate(const Core::Timing::CoreTiming& core_timing, u8* data,
|
||||||
std::size_t size) override;
|
std::size_t size) override;
|
||||||
|
|
||||||
// Called when input devices should be loaded
|
|
||||||
void OnLoadInputDevices() override;
|
|
||||||
|
|
||||||
enum class NPadControllerType {
|
|
||||||
None,
|
|
||||||
ProController,
|
|
||||||
Handheld,
|
|
||||||
JoyDual,
|
|
||||||
JoyLeft,
|
|
||||||
JoyRight,
|
|
||||||
GameCube,
|
|
||||||
Pokeball,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum class NpadType : u8 {
|
|
||||||
ProController = 3,
|
|
||||||
Handheld = 4,
|
|
||||||
JoyconDual = 5,
|
|
||||||
JoyconLeft = 6,
|
|
||||||
JoyconRight = 7,
|
|
||||||
GameCube = 8,
|
|
||||||
Pokeball = 9,
|
|
||||||
MaxNpadType = 10,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum class DeviceIndex : u8 {
|
enum class DeviceIndex : u8 {
|
||||||
Left = 0,
|
Left = 0,
|
||||||
Right = 1,
|
Right = 1,
|
||||||
@ -80,28 +57,33 @@ public:
|
|||||||
MaxDeviceIndex = 3,
|
MaxDeviceIndex = 3,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// This is nn::hid::GyroscopeZeroDriftMode
|
||||||
enum class GyroscopeZeroDriftMode : u32 {
|
enum class GyroscopeZeroDriftMode : u32 {
|
||||||
Loose = 0,
|
Loose = 0,
|
||||||
Standard = 1,
|
Standard = 1,
|
||||||
Tight = 2,
|
Tight = 2,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class NpadHoldType : u64 {
|
// This is nn::hid::NpadJoyHoldType
|
||||||
|
enum class NpadJoyHoldType : u64 {
|
||||||
Vertical = 0,
|
Vertical = 0,
|
||||||
Horizontal = 1,
|
Horizontal = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class NpadAssignments : u32 {
|
// This is nn::hid::NpadJoyAssignmentMode
|
||||||
|
enum class NpadJoyAssignmentMode : u32 {
|
||||||
Dual = 0,
|
Dual = 0,
|
||||||
Single = 1,
|
Single = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// This is nn::hid::NpadHandheldActivationMode
|
||||||
enum class NpadHandheldActivationMode : u64 {
|
enum class NpadHandheldActivationMode : u64 {
|
||||||
Dual = 0,
|
Dual = 0,
|
||||||
Single = 1,
|
Single = 1,
|
||||||
None = 2,
|
None = 2,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// This is nn::hid::NpadCommunicationMode
|
||||||
enum class NpadCommunicationMode : u64 {
|
enum class NpadCommunicationMode : u64 {
|
||||||
Mode_5ms = 0,
|
Mode_5ms = 0,
|
||||||
Mode_10ms = 1,
|
Mode_10ms = 1,
|
||||||
@ -110,33 +92,14 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct DeviceHandle {
|
struct DeviceHandle {
|
||||||
NpadType npad_type;
|
Core::HID::NpadType npad_type;
|
||||||
u8 npad_id;
|
u8 npad_id;
|
||||||
DeviceIndex device_index;
|
DeviceIndex device_index;
|
||||||
INSERT_PADDING_BYTES_NOINIT(1);
|
INSERT_PADDING_BYTES_NOINIT(1);
|
||||||
};
|
};
|
||||||
static_assert(sizeof(DeviceHandle) == 4, "DeviceHandle is an invalid size");
|
static_assert(sizeof(DeviceHandle) == 4, "DeviceHandle is an invalid size");
|
||||||
|
|
||||||
struct NpadStyleSet {
|
// This is nn::hid::VibrationValue
|
||||||
union {
|
|
||||||
u32_le raw{};
|
|
||||||
|
|
||||||
BitField<0, 1, u32> fullkey;
|
|
||||||
BitField<1, 1, u32> handheld;
|
|
||||||
BitField<2, 1, u32> joycon_dual;
|
|
||||||
BitField<3, 1, u32> joycon_left;
|
|
||||||
BitField<4, 1, u32> joycon_right;
|
|
||||||
BitField<5, 1, u32> gamecube;
|
|
||||||
BitField<6, 1, u32> palma;
|
|
||||||
BitField<7, 1, u32> lark;
|
|
||||||
BitField<8, 1, u32> handheld_lark;
|
|
||||||
BitField<9, 1, u32> lucia;
|
|
||||||
BitField<29, 1, u32> system_ext;
|
|
||||||
BitField<30, 1, u32> system;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
static_assert(sizeof(NpadStyleSet) == 4, "NpadStyleSet is an invalid size");
|
|
||||||
|
|
||||||
struct VibrationValue {
|
struct VibrationValue {
|
||||||
f32 amp_low;
|
f32 amp_low;
|
||||||
f32 freq_low;
|
f32 freq_low;
|
||||||
@ -168,15 +131,15 @@ public:
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
void SetSupportedStyleSet(NpadStyleSet style_set);
|
void SetSupportedStyleSet(Core::HID::NpadStyleTag style_set);
|
||||||
NpadStyleSet GetSupportedStyleSet() const;
|
Core::HID::NpadStyleTag GetSupportedStyleSet() const;
|
||||||
|
|
||||||
void SetSupportedNpadIdTypes(u8* data, std::size_t length);
|
void SetSupportedNpadIdTypes(u8* data, std::size_t length);
|
||||||
void GetSupportedNpadIdTypes(u32* data, std::size_t max_length);
|
void GetSupportedNpadIdTypes(u32* data, std::size_t max_length);
|
||||||
std::size_t GetSupportedNpadIdTypesSize() const;
|
std::size_t GetSupportedNpadIdTypesSize() const;
|
||||||
|
|
||||||
void SetHoldType(NpadHoldType joy_hold_type);
|
void SetHoldType(NpadJoyHoldType joy_hold_type);
|
||||||
NpadHoldType GetHoldType() const;
|
NpadJoyHoldType GetHoldType() const;
|
||||||
|
|
||||||
void SetNpadHandheldActivationMode(NpadHandheldActivationMode activation_mode);
|
void SetNpadHandheldActivationMode(NpadHandheldActivationMode activation_mode);
|
||||||
NpadHandheldActivationMode GetNpadHandheldActivationMode() const;
|
NpadHandheldActivationMode GetNpadHandheldActivationMode() const;
|
||||||
@ -184,7 +147,7 @@ public:
|
|||||||
void SetNpadCommunicationMode(NpadCommunicationMode communication_mode_);
|
void SetNpadCommunicationMode(NpadCommunicationMode communication_mode_);
|
||||||
NpadCommunicationMode GetNpadCommunicationMode() const;
|
NpadCommunicationMode GetNpadCommunicationMode() const;
|
||||||
|
|
||||||
void SetNpadMode(u32 npad_id, NpadAssignments assignment_mode);
|
void SetNpadMode(u32 npad_id, NpadJoyAssignmentMode assignment_mode);
|
||||||
|
|
||||||
bool VibrateControllerAtIndex(std::size_t npad_index, std::size_t device_index,
|
bool VibrateControllerAtIndex(std::size_t npad_index, std::size_t device_index,
|
||||||
const VibrationValue& vibration_value);
|
const VibrationValue& vibration_value);
|
||||||
@ -209,9 +172,9 @@ public:
|
|||||||
void SignalStyleSetChangedEvent(u32 npad_id) const;
|
void SignalStyleSetChangedEvent(u32 npad_id) const;
|
||||||
|
|
||||||
// Adds a new controller at an index.
|
// Adds a new controller at an index.
|
||||||
void AddNewControllerAt(NPadControllerType controller, std::size_t npad_index);
|
void AddNewControllerAt(Core::HID::NpadType controller, std::size_t npad_index);
|
||||||
// Adds a new controller at an index with connection status.
|
// Adds a new controller at an index with connection status.
|
||||||
void UpdateControllerAt(NPadControllerType controller, std::size_t npad_index, bool connected);
|
void UpdateControllerAt(Core::HID::NpadType controller, std::size_t npad_index, bool connected);
|
||||||
|
|
||||||
void DisconnectNpad(u32 npad_id);
|
void DisconnectNpad(u32 npad_id);
|
||||||
void DisconnectNpadAtIndex(std::size_t index);
|
void DisconnectNpadAtIndex(std::size_t index);
|
||||||
@ -241,103 +204,37 @@ public:
|
|||||||
// Specifically for cheat engine and other features.
|
// Specifically for cheat engine and other features.
|
||||||
u32 GetAndResetPressState();
|
u32 GetAndResetPressState();
|
||||||
|
|
||||||
static Controller_NPad::NPadControllerType MapSettingsTypeToNPad(Settings::ControllerType type);
|
|
||||||
static Settings::ControllerType MapNPadToSettingsType(Controller_NPad::NPadControllerType type);
|
|
||||||
static std::size_t NPadIdToIndex(u32 npad_id);
|
static std::size_t NPadIdToIndex(u32 npad_id);
|
||||||
static u32 IndexToNPad(std::size_t index);
|
static u32 IndexToNPad(std::size_t index);
|
||||||
static bool IsNpadIdValid(u32 npad_id);
|
static bool IsNpadIdValid(u32 npad_id);
|
||||||
static bool IsDeviceHandleValid(const DeviceHandle& device_handle);
|
static bool IsDeviceHandleValid(const DeviceHandle& device_handle);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct CommonHeader {
|
// This is nn::hid::detail::ColorAttribute
|
||||||
s64_le timestamp;
|
enum class ColorAttribute : u32_le {
|
||||||
s64_le total_entry_count;
|
|
||||||
s64_le last_entry_index;
|
|
||||||
s64_le entry_count;
|
|
||||||
};
|
|
||||||
static_assert(sizeof(CommonHeader) == 0x20, "CommonHeader is an invalid size");
|
|
||||||
|
|
||||||
enum class ColorAttributes : u32_le {
|
|
||||||
Ok = 0,
|
Ok = 0,
|
||||||
ReadError = 1,
|
ReadError = 1,
|
||||||
NoController = 2,
|
NoController = 2,
|
||||||
};
|
};
|
||||||
static_assert(sizeof(ColorAttributes) == 4, "ColorAttributes is an invalid size");
|
static_assert(sizeof(ColorAttribute) == 4, "ColorAttribute is an invalid size");
|
||||||
|
|
||||||
struct ControllerColor {
|
// This is nn::hid::detail::NpadFullKeyColorState
|
||||||
u32_le body;
|
struct NpadFullKeyColorState {
|
||||||
u32_le button;
|
ColorAttribute attribute;
|
||||||
|
Core::HID::NpadControllerColor fullkey;
|
||||||
};
|
};
|
||||||
static_assert(sizeof(ControllerColor) == 8, "ControllerColor is an invalid size");
|
static_assert(sizeof(NpadFullKeyColorState) == 0xC, "NpadFullKeyColorState is an invalid size");
|
||||||
|
|
||||||
struct FullKeyColor {
|
// This is nn::hid::detail::NpadJoyColorState
|
||||||
ColorAttributes attribute;
|
struct NpadJoyColorState {
|
||||||
ControllerColor fullkey;
|
ColorAttribute attribute;
|
||||||
|
Core::HID::NpadControllerColor left;
|
||||||
|
Core::HID::NpadControllerColor right;
|
||||||
};
|
};
|
||||||
static_assert(sizeof(FullKeyColor) == 0xC, "FullKeyColor is an invalid size");
|
static_assert(sizeof(NpadJoyColorState) == 0x14, "NpadJoyColorState is an invalid size");
|
||||||
|
|
||||||
struct JoyconColor {
|
// This is nn::hid::NpadAttribute
|
||||||
ColorAttributes attribute;
|
struct NpadAttribute {
|
||||||
ControllerColor left;
|
|
||||||
ControllerColor right;
|
|
||||||
};
|
|
||||||
static_assert(sizeof(JoyconColor) == 0x14, "JoyconColor is an invalid size");
|
|
||||||
|
|
||||||
struct ControllerPadState {
|
|
||||||
union {
|
|
||||||
u64_le raw{};
|
|
||||||
// Button states
|
|
||||||
BitField<0, 1, u64> a;
|
|
||||||
BitField<1, 1, u64> b;
|
|
||||||
BitField<2, 1, u64> x;
|
|
||||||
BitField<3, 1, u64> y;
|
|
||||||
BitField<4, 1, u64> l_stick;
|
|
||||||
BitField<5, 1, u64> r_stick;
|
|
||||||
BitField<6, 1, u64> l;
|
|
||||||
BitField<7, 1, u64> r;
|
|
||||||
BitField<8, 1, u64> zl;
|
|
||||||
BitField<9, 1, u64> zr;
|
|
||||||
BitField<10, 1, u64> plus;
|
|
||||||
BitField<11, 1, u64> minus;
|
|
||||||
|
|
||||||
// D-Pad
|
|
||||||
BitField<12, 1, u64> d_left;
|
|
||||||
BitField<13, 1, u64> d_up;
|
|
||||||
BitField<14, 1, u64> d_right;
|
|
||||||
BitField<15, 1, u64> d_down;
|
|
||||||
|
|
||||||
// Left JoyStick
|
|
||||||
BitField<16, 1, u64> l_stick_left;
|
|
||||||
BitField<17, 1, u64> l_stick_up;
|
|
||||||
BitField<18, 1, u64> l_stick_right;
|
|
||||||
BitField<19, 1, u64> l_stick_down;
|
|
||||||
|
|
||||||
// Right JoyStick
|
|
||||||
BitField<20, 1, u64> r_stick_left;
|
|
||||||
BitField<21, 1, u64> r_stick_up;
|
|
||||||
BitField<22, 1, u64> r_stick_right;
|
|
||||||
BitField<23, 1, u64> r_stick_down;
|
|
||||||
|
|
||||||
// Not always active?
|
|
||||||
BitField<24, 1, u64> left_sl;
|
|
||||||
BitField<25, 1, u64> left_sr;
|
|
||||||
|
|
||||||
BitField<26, 1, u64> right_sl;
|
|
||||||
BitField<27, 1, u64> right_sr;
|
|
||||||
|
|
||||||
BitField<28, 1, u64> palma;
|
|
||||||
BitField<30, 1, u64> handheld_left_b;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
static_assert(sizeof(ControllerPadState) == 8, "ControllerPadState is an invalid size");
|
|
||||||
|
|
||||||
struct AnalogPosition {
|
|
||||||
s32_le x;
|
|
||||||
s32_le y;
|
|
||||||
};
|
|
||||||
static_assert(sizeof(AnalogPosition) == 8, "AnalogPosition is an invalid size");
|
|
||||||
|
|
||||||
struct ConnectionState {
|
|
||||||
union {
|
union {
|
||||||
u32_le raw{};
|
u32_le raw{};
|
||||||
BitField<0, 1, u32> is_connected;
|
BitField<0, 1, u32> is_connected;
|
||||||
@ -348,76 +245,57 @@ private:
|
|||||||
BitField<5, 1, u32> is_right_wired;
|
BitField<5, 1, u32> is_right_wired;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
static_assert(sizeof(ConnectionState) == 4, "ConnectionState is an invalid size");
|
static_assert(sizeof(NpadAttribute) == 4, "NpadAttribute is an invalid size");
|
||||||
|
|
||||||
struct ControllerPad {
|
// This is nn::hid::NpadFullKeyState
|
||||||
ControllerPadState pad_states;
|
// This is nn::hid::NpadHandheldState
|
||||||
AnalogPosition l_stick;
|
// This is nn::hid::NpadJoyDualState
|
||||||
AnalogPosition r_stick;
|
// This is nn::hid::NpadJoyLeftState
|
||||||
|
// This is nn::hid::NpadJoyRightState
|
||||||
|
// This is nn::hid::NpadPalmaState
|
||||||
|
// This is nn::hid::NpadSystemExtState
|
||||||
|
struct NPadGenericState {
|
||||||
|
s64_le sampling_number;
|
||||||
|
Core::HID::NpadButtonState npad_buttons;
|
||||||
|
Core::HID::AnalogStickState l_stick;
|
||||||
|
Core::HID::AnalogStickState r_stick;
|
||||||
|
NpadAttribute connection_status;
|
||||||
|
INSERT_PADDING_BYTES(4); // Reserved
|
||||||
};
|
};
|
||||||
static_assert(sizeof(ControllerPad) == 0x18, "ControllerPad is an invalid size");
|
static_assert(sizeof(NPadGenericState) == 0x28, "NPadGenericState is an invalid size");
|
||||||
|
|
||||||
struct GenericStates {
|
// This is nn::hid::SixAxisSensorAttribute
|
||||||
s64_le timestamp;
|
struct SixAxisSensorAttribute {
|
||||||
s64_le timestamp2;
|
|
||||||
ControllerPad pad;
|
|
||||||
ConnectionState connection_status;
|
|
||||||
};
|
|
||||||
static_assert(sizeof(GenericStates) == 0x30, "NPadGenericStates is an invalid size");
|
|
||||||
|
|
||||||
struct NPadGeneric {
|
|
||||||
CommonHeader common;
|
|
||||||
std::array<GenericStates, 17> npad;
|
|
||||||
};
|
|
||||||
static_assert(sizeof(NPadGeneric) == 0x350, "NPadGeneric is an invalid size");
|
|
||||||
|
|
||||||
struct SixAxisAttributes {
|
|
||||||
union {
|
union {
|
||||||
u32_le raw{};
|
u32_le raw{};
|
||||||
BitField<0, 1, u32> is_connected;
|
BitField<0, 1, u32> is_connected;
|
||||||
BitField<1, 1, u32> is_interpolated;
|
BitField<1, 1, u32> is_interpolated;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
static_assert(sizeof(SixAxisAttributes) == 4, "SixAxisAttributes is an invalid size");
|
static_assert(sizeof(SixAxisSensorAttribute) == 4, "SixAxisSensorAttribute is an invalid size");
|
||||||
|
|
||||||
struct SixAxisStates {
|
// This is nn::hid::SixAxisSensorState
|
||||||
s64_le timestamp{};
|
struct SixAxisSensorState {
|
||||||
INSERT_PADDING_WORDS(2);
|
s64_le delta_time{};
|
||||||
s64_le timestamp2{};
|
s64_le sampling_number{};
|
||||||
Common::Vec3f accel{};
|
Common::Vec3f accel{};
|
||||||
Common::Vec3f gyro{};
|
Common::Vec3f gyro{};
|
||||||
Common::Vec3f rotation{};
|
Common::Vec3f rotation{};
|
||||||
std::array<Common::Vec3f, 3> orientation{};
|
std::array<Common::Vec3f, 3> orientation{};
|
||||||
SixAxisAttributes attribute;
|
SixAxisSensorAttribute attribute;
|
||||||
INSERT_PADDING_BYTES(4); // Reserved
|
INSERT_PADDING_BYTES(4); // Reserved
|
||||||
};
|
};
|
||||||
static_assert(sizeof(SixAxisStates) == 0x68, "SixAxisStates is an invalid size");
|
static_assert(sizeof(SixAxisSensorState) == 0x60, "SixAxisSensorState is an invalid size");
|
||||||
|
|
||||||
struct SixAxisGeneric {
|
// This is nn::hid::server::NpadGcTriggerState
|
||||||
CommonHeader common{};
|
struct NpadGcTriggerState {
|
||||||
std::array<SixAxisStates, 17> sixaxis{};
|
s64_le sampling_number{};
|
||||||
};
|
|
||||||
static_assert(sizeof(SixAxisGeneric) == 0x708, "SixAxisGeneric is an invalid size");
|
|
||||||
|
|
||||||
struct TriggerState {
|
|
||||||
s64_le timestamp{};
|
|
||||||
s64_le timestamp2{};
|
|
||||||
s32_le l_analog{};
|
s32_le l_analog{};
|
||||||
s32_le r_analog{};
|
s32_le r_analog{};
|
||||||
};
|
};
|
||||||
static_assert(sizeof(TriggerState) == 0x18, "TriggerState is an invalid size");
|
static_assert(sizeof(NpadGcTriggerState) == 0x10, "NpadGcTriggerState is an invalid size");
|
||||||
|
|
||||||
struct TriggerGeneric {
|
|
||||||
INSERT_PADDING_BYTES(0x4);
|
|
||||||
s64_le timestamp;
|
|
||||||
INSERT_PADDING_BYTES(0x4);
|
|
||||||
s64_le total_entry_count;
|
|
||||||
s64_le last_entry_index;
|
|
||||||
s64_le entry_count;
|
|
||||||
std::array<TriggerState, 17> trigger{};
|
|
||||||
};
|
|
||||||
static_assert(sizeof(TriggerGeneric) == 0x1C8, "TriggerGeneric is an invalid size");
|
|
||||||
|
|
||||||
|
// This is nn::hid::NpadSystemProperties
|
||||||
struct NPadSystemProperties {
|
struct NPadSystemProperties {
|
||||||
union {
|
union {
|
||||||
s64_le raw{};
|
s64_le raw{};
|
||||||
@ -438,15 +316,18 @@ private:
|
|||||||
};
|
};
|
||||||
static_assert(sizeof(NPadSystemProperties) == 0x8, "NPadSystemProperties is an invalid size");
|
static_assert(sizeof(NPadSystemProperties) == 0x8, "NPadSystemProperties is an invalid size");
|
||||||
|
|
||||||
struct NPadButtonProperties {
|
// This is nn::hid::NpadSystemButtonProperties
|
||||||
|
struct NpadSystemButtonProperties {
|
||||||
union {
|
union {
|
||||||
s32_le raw{};
|
s32_le raw{};
|
||||||
BitField<0, 1, s32> is_home_button_protection_enabled;
|
BitField<0, 1, s32> is_home_button_protection_enabled;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
static_assert(sizeof(NPadButtonProperties) == 0x4, "NPadButtonProperties is an invalid size");
|
static_assert(sizeof(NpadSystemButtonProperties) == 0x4,
|
||||||
|
"NPadButtonProperties is an invalid size");
|
||||||
|
|
||||||
struct NPadDevice {
|
// This is nn::hid::system::DeviceType
|
||||||
|
struct DeviceType {
|
||||||
union {
|
union {
|
||||||
u32_le raw{};
|
u32_le raw{};
|
||||||
BitField<0, 1, s32> fullkey;
|
BitField<0, 1, s32> fullkey;
|
||||||
@ -469,14 +350,6 @@ private:
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct MotionDevice {
|
|
||||||
Common::Vec3f accel;
|
|
||||||
Common::Vec3f gyro;
|
|
||||||
Common::Vec3f rotation;
|
|
||||||
std::array<Common::Vec3f, 3> orientation;
|
|
||||||
Common::Quaternion<f32> quaternion;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct NfcXcdHandle {
|
struct NfcXcdHandle {
|
||||||
INSERT_PADDING_BYTES(0x60);
|
INSERT_PADDING_BYTES(0x60);
|
||||||
};
|
};
|
||||||
@ -485,6 +358,7 @@ private:
|
|||||||
INSERT_PADDING_BYTES(0x4);
|
INSERT_PADDING_BYTES(0x4);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// This is nn::hid::server::NpadGcTriggerState
|
||||||
enum class AppletFooterUiType : u8 {
|
enum class AppletFooterUiType : u8 {
|
||||||
None = 0,
|
None = 0,
|
||||||
HandheldNone = 1,
|
HandheldNone = 1,
|
||||||
@ -510,95 +384,90 @@ private:
|
|||||||
Lagon = 21,
|
Lagon = 21,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct NPadEntry {
|
// This is nn::hid::detail::NpadInternalState
|
||||||
NpadStyleSet style_set;
|
struct NpadInternalState {
|
||||||
NpadAssignments assignment_mode;
|
Core::HID::NpadStyleTag style_set;
|
||||||
FullKeyColor fullkey_color;
|
NpadJoyAssignmentMode assignment_mode;
|
||||||
JoyconColor joycon_color;
|
NpadFullKeyColorState fullkey_color;
|
||||||
|
NpadJoyColorState joycon_color;
|
||||||
NPadGeneric fullkey_states;
|
Lifo<NPadGenericState> fullkey_lifo;
|
||||||
NPadGeneric handheld_states;
|
Lifo<NPadGenericState> handheld_lifo;
|
||||||
NPadGeneric joy_dual_states;
|
Lifo<NPadGenericState> joy_dual_lifo;
|
||||||
NPadGeneric joy_left_states;
|
Lifo<NPadGenericState> joy_left_lifo;
|
||||||
NPadGeneric joy_right_states;
|
Lifo<NPadGenericState> joy_right_lifo;
|
||||||
NPadGeneric palma_states;
|
Lifo<NPadGenericState> palma_lifo;
|
||||||
NPadGeneric system_ext_states;
|
Lifo<NPadGenericState> system_ext_lifo;
|
||||||
SixAxisGeneric sixaxis_fullkey;
|
Lifo<SixAxisSensorState> sixaxis_fullkey_lifo;
|
||||||
SixAxisGeneric sixaxis_handheld;
|
Lifo<SixAxisSensorState> sixaxis_handheld_lifo;
|
||||||
SixAxisGeneric sixaxis_dual_left;
|
Lifo<SixAxisSensorState> sixaxis_dual_left_lifo;
|
||||||
SixAxisGeneric sixaxis_dual_right;
|
Lifo<SixAxisSensorState> sixaxis_dual_right_lifo;
|
||||||
SixAxisGeneric sixaxis_left;
|
Lifo<SixAxisSensorState> sixaxis_left_lifo;
|
||||||
SixAxisGeneric sixaxis_right;
|
Lifo<SixAxisSensorState> sixaxis_right_lifo;
|
||||||
NPadDevice device_type;
|
DeviceType device_type;
|
||||||
INSERT_PADDING_BYTES(0x4); // reserved
|
INSERT_PADDING_BYTES(0x4); // Reserved
|
||||||
NPadSystemProperties system_properties;
|
NPadSystemProperties system_properties;
|
||||||
NPadButtonProperties button_properties;
|
NpadSystemButtonProperties button_properties;
|
||||||
u32 battery_level_dual;
|
Core::HID::BatteryLevel battery_level_dual;
|
||||||
u32 battery_level_left;
|
Core::HID::BatteryLevel battery_level_left;
|
||||||
u32 battery_level_right;
|
Core::HID::BatteryLevel battery_level_right;
|
||||||
AppletFooterUiAttributes footer_attributes;
|
AppletFooterUiAttributes footer_attributes;
|
||||||
AppletFooterUiType footer_type;
|
AppletFooterUiType footer_type;
|
||||||
// nfc_states needs to be checked switchbrew does not match with HW
|
// nfc_states needs to be checked switchbrew doesn't match with HW
|
||||||
NfcXcdHandle nfc_states;
|
NfcXcdHandle nfc_states;
|
||||||
INSERT_PADDING_BYTES(0x8); // Mutex
|
INSERT_PADDING_BYTES(0x18); // Unknown
|
||||||
TriggerGeneric gc_trigger_states;
|
Lifo<NpadGcTriggerState> gc_trigger_lifo;
|
||||||
INSERT_PADDING_BYTES(0xc1f);
|
INSERT_PADDING_BYTES(0xc1f); // Unknown
|
||||||
};
|
};
|
||||||
static_assert(sizeof(NPadEntry) == 0x5000, "NPadEntry is an invalid size");
|
static_assert(sizeof(NpadInternalState) == 0x5000, "NpadInternalState is an invalid size");
|
||||||
|
|
||||||
struct ControllerHolder {
|
struct VibrationData {
|
||||||
NPadControllerType type;
|
bool device_mounted{};
|
||||||
bool is_connected;
|
VibrationValue latest_vibration_value{};
|
||||||
|
std::chrono::steady_clock::time_point last_vibration_timepoint{};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct ControllerData {
|
||||||
|
Core::HID::EmulatedController* device;
|
||||||
|
Kernel::KEvent* styleset_changed_event{};
|
||||||
|
NpadInternalState shared_memory_entry{};
|
||||||
|
|
||||||
|
std::array<VibrationData, 2> vibration{};
|
||||||
|
bool unintended_home_button_input_protection{};
|
||||||
|
|
||||||
|
// Current pad state
|
||||||
|
NPadGenericState npad_pad_state{};
|
||||||
|
NPadGenericState npad_libnx_state{};
|
||||||
|
NpadGcTriggerState npad_trigger_state{};
|
||||||
|
SixAxisSensorState sixaxis_fullkey_state{};
|
||||||
|
SixAxisSensorState sixaxis_handheld_state{};
|
||||||
|
SixAxisSensorState sixaxis_dual_left_state{};
|
||||||
|
SixAxisSensorState sixaxis_dual_right_state{};
|
||||||
|
SixAxisSensorState sixaxis_left_lifo_state{};
|
||||||
|
SixAxisSensorState sixaxis_right_lifo_state{};
|
||||||
|
int callback_key;
|
||||||
|
};
|
||||||
|
|
||||||
|
void ControllerUpdate(Core::HID::ControllerTriggerType type, std::size_t controller_idx);
|
||||||
void InitNewlyAddedController(std::size_t controller_idx);
|
void InitNewlyAddedController(std::size_t controller_idx);
|
||||||
bool IsControllerSupported(NPadControllerType controller) const;
|
bool IsControllerSupported(Core::HID::NpadType controller) const;
|
||||||
void RequestPadStateUpdate(u32 npad_id);
|
void RequestPadStateUpdate(u32 npad_id);
|
||||||
|
|
||||||
std::atomic<u32> press_state{};
|
std::atomic<u32> press_state{};
|
||||||
|
|
||||||
NpadStyleSet style{};
|
std::array<ControllerData, 10> controller_data{};
|
||||||
std::array<NPadEntry, 10> shared_memory_entries{};
|
|
||||||
using ButtonArray = std::array<
|
|
||||||
std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeButton::NUM_BUTTONS_HID>,
|
|
||||||
10>;
|
|
||||||
using StickArray = std::array<
|
|
||||||
std::array<std::unique_ptr<Input::AnalogDevice>, Settings::NativeAnalog::NumAnalogs>,
|
|
||||||
10>;
|
|
||||||
using VibrationArray = std::array<std::array<std::unique_ptr<Input::VibrationDevice>,
|
|
||||||
Settings::NativeVibration::NUM_VIBRATIONS_HID>,
|
|
||||||
10>;
|
|
||||||
using MotionArray = std::array<
|
|
||||||
std::array<std::unique_ptr<Input::MotionDevice>, Settings::NativeMotion::NUM_MOTIONS_HID>,
|
|
||||||
10>;
|
|
||||||
|
|
||||||
KernelHelpers::ServiceContext& service_context;
|
KernelHelpers::ServiceContext& service_context;
|
||||||
std::mutex mutex;
|
std::mutex mutex;
|
||||||
ButtonArray buttons;
|
|
||||||
StickArray sticks;
|
|
||||||
VibrationArray vibrations;
|
|
||||||
MotionArray motions;
|
|
||||||
std::vector<u32> supported_npad_id_types{};
|
std::vector<u32> supported_npad_id_types{};
|
||||||
NpadHoldType hold_type{NpadHoldType::Vertical};
|
NpadJoyHoldType hold_type{NpadJoyHoldType::Vertical};
|
||||||
NpadHandheldActivationMode handheld_activation_mode{NpadHandheldActivationMode::Dual};
|
NpadHandheldActivationMode handheld_activation_mode{NpadHandheldActivationMode::Dual};
|
||||||
NpadCommunicationMode communication_mode{NpadCommunicationMode::Default};
|
NpadCommunicationMode communication_mode{NpadCommunicationMode::Default};
|
||||||
// Each controller should have their own styleset changed event
|
|
||||||
std::array<Kernel::KEvent*, 10> styleset_changed_events{};
|
|
||||||
std::array<std::array<std::chrono::steady_clock::time_point, 2>, 10>
|
|
||||||
last_vibration_timepoints{};
|
|
||||||
std::array<std::array<VibrationValue, 2>, 10> latest_vibration_values{};
|
|
||||||
bool permit_vibration_session_enabled{false};
|
bool permit_vibration_session_enabled{false};
|
||||||
std::array<std::array<bool, 2>, 10> vibration_devices_mounted{};
|
|
||||||
std::array<ControllerHolder, 10> connected_controllers{};
|
|
||||||
std::array<bool, 10> unintended_home_button_input_protection{};
|
|
||||||
bool analog_stick_use_center_clamp{};
|
bool analog_stick_use_center_clamp{};
|
||||||
GyroscopeZeroDriftMode gyroscope_zero_drift_mode{GyroscopeZeroDriftMode::Standard};
|
GyroscopeZeroDriftMode gyroscope_zero_drift_mode{GyroscopeZeroDriftMode::Standard};
|
||||||
bool sixaxis_sensors_enabled{true};
|
bool sixaxis_sensors_enabled{true};
|
||||||
f32 sixaxis_fusion_parameter1{};
|
f32 sixaxis_fusion_parameter1{};
|
||||||
f32 sixaxis_fusion_parameter2{};
|
f32 sixaxis_fusion_parameter2{};
|
||||||
bool sixaxis_at_rest{true};
|
bool sixaxis_at_rest{true};
|
||||||
std::array<ControllerPad, 10> npad_pad_states{};
|
|
||||||
std::array<TriggerState, 10> npad_trigger_states{};
|
|
||||||
bool is_in_lr_assignment_mode{false};
|
bool is_in_lr_assignment_mode{false};
|
||||||
};
|
};
|
||||||
} // namespace Service::HID
|
} // namespace Service::HID
|
||||||
|
Loading…
Reference in New Issue
Block a user