octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34 from shinyquagsire23/hid-sharedmem-layouts-circbufs-meta 

hid: Write to all layouts, implement circular buffers, set up controller metadata.
This commit is contained in:
bunnei 2018-01-16 21:54:46 -05:00 committed by GitHub
parent 4b156d2e64 eff90550a1
commit dc905463dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 119 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/core/hle/service/hid/hid.cpp
View File

@ -65,44 +65,71 @@ private:
if (is_device_reload_pending.exchange(false)) if (is_device_reload_pending.exchange(false))
LoadInputDevices(); LoadInputDevices();
// TODO(shinyquagsire23): This is a hack! // Set up controllers as neon red+blue Joy-Con attached to console
ControllerPadState& state = ControllerHeader& controller_header = mem->controllers[Controller_Handheld].header;
mem->controllers[Controller_Handheld].layouts[Layout_Default].entries[0].buttons; controller_header.type = ControllerType_Handheld | ControllerType_JoyconPair;
using namespace Settings::NativeButton; controller_header.single_colors_descriptor = ColorDesc_ColorsNonexistent;
state.a.Assign(buttons[A - BUTTON_HID_BEGIN]->GetStatus()); controller_header.right_color_body = JOYCON_BODY_NEON_RED;
state.b.Assign(buttons[B - BUTTON_HID_BEGIN]->GetStatus()); controller_header.right_color_buttons = JOYCON_BUTTONS_NEON_RED;
state.x.Assign(buttons[X - BUTTON_HID_BEGIN]->GetStatus()); controller_header.left_color_body = JOYCON_BODY_NEON_BLUE;
state.y.Assign(buttons[Y - BUTTON_HID_BEGIN]->GetStatus()); controller_header.left_color_buttons = JOYCON_BUTTONS_NEON_BLUE;
state.lstick.Assign(buttons[LStick - BUTTON_HID_BEGIN]->GetStatus());
state.rstick.Assign(buttons[RStick - BUTTON_HID_BEGIN]->GetStatus());
state.l.Assign(buttons[L - BUTTON_HID_BEGIN]->GetStatus());
state.r.Assign(buttons[R - BUTTON_HID_BEGIN]->GetStatus());
state.zl.Assign(buttons[ZL - BUTTON_HID_BEGIN]->GetStatus());
state.zr.Assign(buttons[ZR - BUTTON_HID_BEGIN]->GetStatus());
state.plus.Assign(buttons[Plus - BUTTON_HID_BEGIN]->GetStatus());
state.minus.Assign(buttons[Minus - BUTTON_HID_BEGIN]->GetStatus());
state.dleft.Assign(buttons[DLeft - BUTTON_HID_BEGIN]->GetStatus()); for (int layoutIdx = 0; layoutIdx < HID_NUM_LAYOUTS; layoutIdx++) {
state.dup.Assign(buttons[DUp - BUTTON_HID_BEGIN]->GetStatus()); ControllerLayout& layout = mem->controllers[Controller_Handheld].layouts[layoutIdx];
state.dright.Assign(buttons[DRight - BUTTON_HID_BEGIN]->GetStatus()); layout.header.num_entries = HID_NUM_ENTRIES;
state.ddown.Assign(buttons[DDown - BUTTON_HID_BEGIN]->GetStatus()); layout.header.max_entry_index = HID_NUM_ENTRIES - 1;
state.lstick_left.Assign(buttons[LStick_Left - BUTTON_HID_BEGIN]->GetStatus()); // HID shared memory stores the state of the past 17 samples in a circlular buffer,
state.lstick_up.Assign(buttons[LStick_Up - BUTTON_HID_BEGIN]->GetStatus()); // each with a timestamp in number of samples since boot.
state.lstick_right.Assign(buttons[LStick_Right - BUTTON_HID_BEGIN]->GetStatus()); layout.header.timestamp_ticks = CoreTiming::GetTicks();
state.lstick_down.Assign(buttons[LStick_Down - BUTTON_HID_BEGIN]->GetStatus()); layout.header.latest_entry = (layout.header.latest_entry + 1) % HID_NUM_ENTRIES;
state.rstick_left.Assign(buttons[RStick_Left - BUTTON_HID_BEGIN]->GetStatus()); ControllerInputEntry& entry = layout.entries[layout.header.latest_entry];
state.rstick_up.Assign(buttons[RStick_Up - BUTTON_HID_BEGIN]->GetStatus()); entry.connection_state = ConnectionState_Connected | ConnectionState_Wired;
state.rstick_right.Assign(buttons[RStick_Right - BUTTON_HID_BEGIN]->GetStatus()); entry.timestamp++;
state.rstick_down.Assign(buttons[RStick_Down - BUTTON_HID_BEGIN]->GetStatus()); entry.timestamp_2++; // TODO(shinyquagsire23): Is this always identical to timestamp?
state.sl.Assign(buttons[SL - BUTTON_HID_BEGIN]->GetStatus()); // TODO(shinyquagsire23): Set up some LUTs for each layout mapping in the future?
state.sr.Assign(buttons[SR - BUTTON_HID_BEGIN]->GetStatus()); // For now everything is just the default handheld layout, but split Joy-Con will
// rotate the face buttons and directions for certain layouts.
ControllerPadState& state = entry.buttons;
using namespace Settings::NativeButton;
state.a.Assign(buttons[A - BUTTON_HID_BEGIN]->GetStatus());
state.b.Assign(buttons[B - BUTTON_HID_BEGIN]->GetStatus());
state.x.Assign(buttons[X - BUTTON_HID_BEGIN]->GetStatus());
state.y.Assign(buttons[Y - BUTTON_HID_BEGIN]->GetStatus());
state.lstick.Assign(buttons[LStick - BUTTON_HID_BEGIN]->GetStatus());
state.rstick.Assign(buttons[RStick - BUTTON_HID_BEGIN]->GetStatus());
state.l.Assign(buttons[L - BUTTON_HID_BEGIN]->GetStatus());
state.r.Assign(buttons[R - BUTTON_HID_BEGIN]->GetStatus());
state.zl.Assign(buttons[ZL - BUTTON_HID_BEGIN]->GetStatus());
state.zr.Assign(buttons[ZR - BUTTON_HID_BEGIN]->GetStatus());
state.plus.Assign(buttons[Plus - BUTTON_HID_BEGIN]->GetStatus());
state.minus.Assign(buttons[Minus - BUTTON_HID_BEGIN]->GetStatus());
// TODO(shinyquagsire23): Analog stick vals state.dleft.Assign(buttons[DLeft - BUTTON_HID_BEGIN]->GetStatus());
state.dup.Assign(buttons[DUp - BUTTON_HID_BEGIN]->GetStatus());
state.dright.Assign(buttons[DRight - BUTTON_HID_BEGIN]->GetStatus());
state.ddown.Assign(buttons[DDown - BUTTON_HID_BEGIN]->GetStatus());
// TODO(shinyquagsire23): Update pad info proper, (circular buffers, timestamps, layouts) state.lstick_left.Assign(buttons[LStick_Left - BUTTON_HID_BEGIN]->GetStatus());
state.lstick_up.Assign(buttons[LStick_Up - BUTTON_HID_BEGIN]->GetStatus());
state.lstick_right.Assign(buttons[LStick_Right - BUTTON_HID_BEGIN]->GetStatus());
state.lstick_down.Assign(buttons[LStick_Down - BUTTON_HID_BEGIN]->GetStatus());
state.rstick_left.Assign(buttons[RStick_Left - BUTTON_HID_BEGIN]->GetStatus());
state.rstick_up.Assign(buttons[RStick_Up - BUTTON_HID_BEGIN]->GetStatus());
state.rstick_right.Assign(buttons[RStick_Right - BUTTON_HID_BEGIN]->GetStatus());
state.rstick_down.Assign(buttons[RStick_Down - BUTTON_HID_BEGIN]->GetStatus());
state.sl.Assign(buttons[SL - BUTTON_HID_BEGIN]->GetStatus());
state.sr.Assign(buttons[SR - BUTTON_HID_BEGIN]->GetStatus());
// TODO(shinyquagsire23): Analog stick vals
// TODO(shinyquagsire23): Update pad info proper, (circular buffers, timestamps,
// layouts)
}
// TODO(shinyquagsire23): Update touch info // TODO(shinyquagsire23): Update touch info

110
src/core/hle/service/hid/hid.h
View File

@ -12,6 +12,16 @@ namespace HID {
// Begin enums and output structs // Begin enums and output structs
constexpr u32 HID_NUM_ENTRIES = 17;
constexpr u32 HID_NUM_LAYOUTS = 7;
constexpr s32 HID_JOYSTICK_MAX = 0x8000;
constexpr s32 HID_JOYSTICK_MIN = -0x8000;
constexpr u32 JOYCON_BODY_NEON_RED = 0xFF3C28;
constexpr u32 JOYCON_BUTTONS_NEON_RED = 0x1E0A0A;
constexpr u32 JOYCON_BODY_NEON_BLUE = 0x0AB9E6;
constexpr u32 JOYCON_BUTTONS_NEON_BLUE = 0x001E1E;
enum ControllerType : u32 { enum ControllerType : u32 {
ControllerType_ProController = 1 << 0, ControllerType_ProController = 1 << 0,
ControllerType_Handheld = 1 << 1, ControllerType_Handheld = 1 << 1,
@ -57,10 +67,10 @@ enum ControllerID {
// Begin TouchScreen // Begin TouchScreen
struct TouchScreenHeader { struct TouchScreenHeader {
u64 timestampTicks; u64 timestamp_ticks;
u64 numEntries; u64 num_entries;
u64 latestEntry; u64 latest_entry;
u64 maxEntryIndex; u64 max_entry_index;
u64 timestamp; u64 timestamp;
}; };
static_assert(sizeof(TouchScreenHeader) == 0x28, static_assert(sizeof(TouchScreenHeader) == 0x28,
@ -68,7 +78,7 @@ static_assert(sizeof(TouchScreenHeader) == 0x28,
struct TouchScreenEntryHeader { struct TouchScreenEntryHeader {
u64 timestamp; u64 timestamp;
u64 numTouches; u64 num_touches;
}; };
static_assert(sizeof(TouchScreenEntryHeader) == 0x10, static_assert(sizeof(TouchScreenEntryHeader) == 0x10,
"HID touch screen entry header structure has incorrect size"); "HID touch screen entry header structure has incorrect size");
@ -76,11 +86,11 @@ static_assert(sizeof(TouchScreenEntryHeader) == 0x10,
struct TouchScreenEntryTouch { struct TouchScreenEntryTouch {
u64 timestamp; u64 timestamp;
u32 padding; u32 padding;
u32 touchIndex; u32 touch_index;
u32 x; u32 x;
u32 y; u32 y;
u32 diameterX; u32 diameter_x;
u32 diameterY; u32 diameter_y;
u32 angle; u32 angle;
u32 padding_2; u32 padding_2;
}; };
@ -107,10 +117,10 @@ static_assert(sizeof(TouchScreen) == 0x3000, "HID touch screen structure has inc
// Begin Mouse // Begin Mouse
struct MouseHeader { struct MouseHeader {
u64 timestampTicks; u64 timestamp_ticks;
u64 numEntries; u64 num_entries;
u64 latestEntry; u64 latest_entry;
u64 maxEntryIndex; u64 max_entry_index;
}; };
static_assert(sizeof(MouseHeader) == 0x20, "HID mouse header structure has incorrect size"); static_assert(sizeof(MouseHeader) == 0x20, "HID mouse header structure has incorrect size");
@ -132,10 +142,10 @@ struct MouseEntry {
u64 timestamp_2; u64 timestamp_2;
u32 x; u32 x;
u32 y; u32 y;
u32 velocityX; u32 velocity_x;
u32 velocityY; u32 velocity_y;
u32 scrollVelocityX; u32 scroll_velocity_x;
u32 scrollVelocityY; u32 scroll_velocity_y;
MouseButtonState buttons; MouseButtonState buttons;
}; };
static_assert(sizeof(MouseEntry) == 0x30, "HID mouse entry structure has incorrect size"); static_assert(sizeof(MouseEntry) == 0x30, "HID mouse entry structure has incorrect size");
@ -152,10 +162,10 @@ static_assert(sizeof(Mouse) == 0x400, "HID mouse structure has incorrect size");
// Begin Keyboard // Begin Keyboard
struct KeyboardHeader { struct KeyboardHeader {
u64 timestampTicks; u64 timestamp_ticks;
u64 numEntries; u64 num_entries;
u64 latestEntry; u64 latest_entry;
u64 maxEntryIndex; u64 max_entry_index;
}; };
static_assert(sizeof(KeyboardHeader) == 0x20, "HID keyboard header structure has incorrect size"); static_assert(sizeof(KeyboardHeader) == 0x20, "HID keyboard header structure has incorrect size");
@ -207,24 +217,24 @@ static_assert(sizeof(ControllerMAC) == 0x20, "HID controller MAC structure has i
struct ControllerHeader { struct ControllerHeader {
u32 type; u32 type;
u32 isHalf; u32 is_half;
u32 singleColorsDescriptor; u32 single_colors_descriptor;
u32 singleColorBody; u32 single_color_body;
u32 singleColorButtons; u32 single_color_buttons;
u32 splitColorsDescriptor; u32 split_colors_descriptor;
u32 leftColorBody; u32 left_color_body;
u32 leftColorButtons; u32 left_color_buttons;
u32 rightColorBody; u32 right_color_body;
u32 rightColorbuttons; u32 right_color_buttons;
}; };
static_assert(sizeof(ControllerHeader) == 0x28, static_assert(sizeof(ControllerHeader) == 0x28,
"HID controller header structure has incorrect size"); "HID controller header structure has incorrect size");
struct ControllerLayoutHeader { struct ControllerLayoutHeader {
u64 timestampTicks; u64 timestamp_ticks;
u64 numEntries; u64 num_entries;
u64 latestEntry; u64 latest_entry;
u64 maxEntryIndex; u64 max_entry_index;
}; };
static_assert(sizeof(ControllerLayoutHeader) == 0x20, static_assert(sizeof(ControllerLayoutHeader) == 0x20,
"HID controller layout header structure has incorrect size"); "HID controller layout header structure has incorrect size");
@ -274,11 +284,11 @@ struct ControllerInputEntry {
u64 timestamp; u64 timestamp;
u64 timestamp_2; u64 timestamp_2;
ControllerPadState buttons; ControllerPadState buttons;
u32 joystickLeftX; u32 joystick_left_x;
u32 joystickLeftY; u32 joystick_left_y;
u32 joystickRightX; u32 joystick_right_x;
u32 joystickRightY; u32 joystick_right_y;
u64 connectionState; u64 connection_state;
}; };
static_assert(sizeof(ControllerInputEntry) == 0x30, static_assert(sizeof(ControllerInputEntry) == 0x30,
"HID controller input entry structure has incorrect size"); "HID controller input entry structure has incorrect size");
@ -294,8 +304,8 @@ struct Controller {
ControllerHeader header; ControllerHeader header;
std::array<ControllerLayout, 7> layouts; std::array<ControllerLayout, 7> layouts;
std::array<u8, 0x2a70> unk_1; std::array<u8, 0x2a70> unk_1;
ControllerMAC macLeft; ControllerMAC mac_left;
ControllerMAC macRight; ControllerMAC mac_right;
std::array<u8, 0xdf8> unk_2; std::array<u8, 0xdf8> unk_2;
}; };
static_assert(sizeof(Controller) == 0x5000, "HID controller structure has incorrect size"); static_assert(sizeof(Controller) == 0x5000, "HID controller structure has incorrect size");
@ -307,17 +317,17 @@ struct SharedMemory {
TouchScreen touchscreen; TouchScreen touchscreen;
Mouse mouse; Mouse mouse;
Keyboard keyboard; Keyboard keyboard;
std::array<u8, 0x400> unkSection1; std::array<u8, 0x400> unk_section_1;
std::array<u8, 0x400> unkSection2; std::array<u8, 0x400> unk_section_2;
std::array<u8, 0x400> unkSection3; std::array<u8, 0x400> unk_section_3;
std::array<u8, 0x400> unkSection4; std::array<u8, 0x400> unk_section_4;
std::array<u8, 0x200> unkSection5; std::array<u8, 0x200> unk_section_5;
std::array<u8, 0x200> unkSection6; std::array<u8, 0x200> unk_section_6;
std::array<u8, 0x200> unkSection7; std::array<u8, 0x200> unk_section_7;
std::array<u8, 0x800> unkSection8; std::array<u8, 0x800> unk_section_8;
std::array<u8, 0x4000> controllerSerials; std::array<u8, 0x4000> controller_serials;
std::array<Controller, 10> controllers; std::array<Controller, 10> controllers;
std::array<u8, 0x4600> unkSection9; std::array<u8, 0x4600> unk_section_9;
}; };
static_assert(sizeof(SharedMemory) == 0x40000, "HID Shared Memory structure has incorrect size"); static_assert(sizeof(SharedMemory) == 0x40000, "HID Shared Memory structure has incorrect size");