From 3229b048d9b4f16433fb1c5d623e6b79bc1a2d93 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 8 Mar 2015 00:13:49 -0500 Subject: [PATCH] HID: Moved some docstrings to the header. --- src/core/hle/service/hid/hid.cpp | 25 ++----------------------- src/core/hle/service/hid/hid.h | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index c21799db6..5812724d2 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -32,7 +32,7 @@ static s16 next_pad_circle_y = 0; /** * Gets a pointer to the PadData structure inside HID shared memory */ -static inline SharedMem* GetPadData() { +static inline SharedMem* GetSharedMem() { if (g_shared_mem == nullptr) return nullptr; return reinterpret_cast(g_shared_mem->GetPointer().ValueOr(nullptr)); @@ -66,28 +66,18 @@ static void UpdateNextCirclePadState() { next_pad_circle_y += next_state.circle_up ? max_value : 0x0; } -/** - * Sets a Pad state (button or button combo) as pressed - */ void PadButtonPress(const PadState& pad_state) { next_state.hex |= pad_state.hex; UpdateNextCirclePadState(); } -/** - * Sets a Pad state (button or button combo) as released - */ void PadButtonRelease(const PadState& pad_state) { next_state.hex &= ~pad_state.hex; UpdateNextCirclePadState(); } -/** - * Called after all Pad changes to be included in this update have been made, - * including both Pad key changes and analog circle Pad changes. - */ void PadUpdateComplete() { - SharedMem* shared_mem = GetPadData(); + SharedMem* shared_mem = GetSharedMem(); if (shared_mem == nullptr) return; @@ -135,17 +125,6 @@ void PadUpdateComplete() { g_event_pad_or_touch_2->Signal(); } - // If we just updated index 0, provide a new timestamp - if (pad_data->index == 0) { - pad_data->index_reset_ticks_previous = pad_data->index_reset_ticks; - pad_data->index_reset_ticks = (s64)Core::g_app_core->GetTicks(); - } - - // Signal both handles when there's an update to Pad or touch - g_event_pad_or_touch_1->Signal(); - g_event_pad_or_touch_2->Signal(); -} - void GetIPCHandles(Service::Interface* self) { u32* cmd_buff = Kernel::GetCommandBuffer(); diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index 6318d1d53..cd6263243 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -162,9 +162,22 @@ const PadState PAD_CIRCLE_DOWN = {{1u << 31}}; */ void GetIPCHandles(Interface* self); -// Methods for updating the HID module's state +/** + * Sets a Pad state (button or button combo) as pressed + * @param pad_state PadState data indicating which buttons have been pressed + */ void PadButtonPress(const PadState& pad_state); + +/** + * Sets a Pad state (button or button combo) as released + * @param pad_state PadState data indicating which buttons have been released + */ void PadButtonRelease(const PadState& pad_state); + +/** + * Called after all Pad changes to be included in this update have been made, including both Pad + * key changes and analog circle Pad changes. + */ void PadUpdateComplete(); void HIDInit();