summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/config_mem.cpp1
-rw-r--r--src/core/hle/coprocessor.cpp1
-rw-r--r--src/core/hle/hle.cpp1
-rw-r--r--src/core/hle/kernel/archive.cpp1
-rw-r--r--src/core/hle/kernel/kernel.cpp2
-rw-r--r--src/core/hle/kernel/thread.cpp3
-rw-r--r--src/core/hle/service/fs.cpp2
-rw-r--r--src/core/hle/service/gsp.cpp1
-rw-r--r--src/core/hle/service/hid.cpp145
-rw-r--r--src/core/hle/service/hid.h90
-rw-r--r--src/core/hle/service/ndm.cpp2
-rw-r--r--src/core/hle/service/service.cpp5
-rw-r--r--src/core/hle/service/srv.cpp1
-rw-r--r--src/core/hle/svc.cpp5
14 files changed, 226 insertions, 34 deletions
diff --git a/src/core/hle/config_mem.cpp b/src/core/hle/config_mem.cpp
index 8c898b265..a45e61427 100644
--- a/src/core/hle/config_mem.cpp
+++ b/src/core/hle/config_mem.cpp
@@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include "common/common_types.h"
-#include "common/log.h"
#include "core/hle/config_mem.h"
diff --git a/src/core/hle/coprocessor.cpp b/src/core/hle/coprocessor.cpp
index 9a5b0deda..1eb33eb86 100644
--- a/src/core/hle/coprocessor.cpp
+++ b/src/core/hle/coprocessor.cpp
@@ -5,7 +5,6 @@
#include "core/hle/coprocessor.h"
#include "core/hle/hle.h"
#include "core/mem_map.h"
-#include "core/core.h"
namespace HLE {
diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp
index 53cda4a61..b03894ad7 100644
--- a/src/core/hle/hle.cpp
+++ b/src/core/hle/hle.cpp
@@ -6,7 +6,6 @@
#include "core/mem_map.h"
#include "core/hle/hle.h"
-#include "core/hle/svc.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/service/service.h"
diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp
index 1596367c3..20536f40f 100644
--- a/src/core/hle/kernel/archive.cpp
+++ b/src/core/hle/kernel/archive.cpp
@@ -7,7 +7,6 @@
#include "core/file_sys/archive.h"
#include "core/hle/service/service.h"
-#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/archive.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index a4a258875..e56f1879e 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -2,8 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include <string.h>
-
#include "common/common.h"
#include "core/core.h"
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 8bd9ca1a1..33c0b2a47 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -3,10 +3,8 @@
// Refer to the license.txt file included.
#include <algorithm>
-#include <cstdio>
#include <list>
#include <map>
-#include <string>
#include <vector>
#include "common/common.h"
@@ -15,7 +13,6 @@
#include "core/core.h"
#include "core/mem_map.h"
#include "core/hle/hle.h"
-#include "core/hle/svc.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/thread.h"
diff --git a/src/core/hle/service/fs.cpp b/src/core/hle/service/fs.cpp
index 5eabf36ad..9e1998b0f 100644
--- a/src/core/hle/service/fs.cpp
+++ b/src/core/hle/service/fs.cpp
@@ -4,8 +4,6 @@
#include "common/common.h"
-#include "core/loader/loader.h"
-#include "core/hle/hle.h"
#include "core/hle/service/fs.h"
#include "core/hle/kernel/archive.h"
diff --git a/src/core/hle/service/gsp.cpp b/src/core/hle/service/gsp.cpp
index 46c5a8ddd..accbe84e3 100644
--- a/src/core/hle/service/gsp.cpp
+++ b/src/core/hle/service/gsp.cpp
@@ -7,7 +7,6 @@
#include "common/bit_field.h"
#include "core/mem_map.h"
-#include "core/hle/hle.h"
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/shared_memory.h"
#include "core/hle/service/gsp.h"
diff --git a/src/core/hle/service/hid.cpp b/src/core/hle/service/hid.cpp
index 4e470795f..b6ec1b8ff 100644
--- a/src/core/hle/service/hid.cpp
+++ b/src/core/hle/service/hid.cpp
@@ -14,7 +14,128 @@
namespace HID_User {
-Handle g_shared_mem = 0; ///< Handle to shared memory region designated to HID_User service
+// Handle to shared memory region designated to HID_User service
+static Handle shared_mem = 0;
+
+// Event handles
+static Handle event_pad_or_touch_1 = 0;
+static Handle event_pad_or_touch_2 = 0;
+static Handle event_accelerometer = 0;
+static Handle event_gyroscope = 0;
+static Handle event_debug_pad = 0;
+
+// Next Pad state update information
+static PadState next_state = {{0}};
+static u32 next_index = 0;
+static s16 next_circle_x = 0;
+static s16 next_circle_y = 0;
+
+/**
+ * Gets a pointer to the PadData structure inside HID shared memory
+ */
+static inline PadData* GetPadData() {
+ if (0 == shared_mem)
+ return nullptr;
+
+ return reinterpret_cast<PadData*>(Kernel::GetSharedMemoryPointer(shared_mem, 0));
+}
+
+/**
+ * Circle Pad from keys.
+ *
+ * This is implemented as "pushed all the way to an edge (max) or centered (0)".
+ *
+ * Indicate the circle pad is pushed completely to the edge in 1 of 8 directions.
+ */
+void UpdateNextCirclePadState() {
+ static const s16 max_value = 0x9C;
+ next_circle_x = next_state.circle_left ? -max_value : 0x0;
+ next_circle_x += next_state.circle_right ? max_value : 0x0;
+ next_circle_y = next_state.circle_down ? -max_value : 0x0;
+ next_circle_y += next_state.circle_up ? max_value : 0x0;
+}
+
+/**
+ * Sets a Pad state (button or button combo) as pressed
+ */
+void PadButtonPress(PadState pad_state) {
+ next_state.hex |= pad_state.hex;
+ UpdateNextCirclePadState();
+}
+
+/**
+ * Sets a Pad state (button or button combo) as released
+ */
+void PadButtonRelease(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() {
+ PadData* pad_data = GetPadData();
+
+ // Update PadData struct
+ pad_data->current_state.hex = next_state.hex;
+ pad_data->index = next_index;
+ next_index = (next_index + 1) % pad_data->entries.size();
+
+ // Get the previous Pad state
+ u32 last_entry_index = (pad_data->index - 1) % pad_data->entries.size();
+ PadState old_state = pad_data->entries[last_entry_index].current_state;
+
+ // Compute bitmask with 1s for bits different from the old state
+ PadState changed;
+ changed.hex = (next_state.hex ^ old_state.hex);
+
+ // Compute what was added
+ PadState additions;
+ additions.hex = changed.hex & next_state.hex;
+
+ // Compute what was removed
+ PadState removals;
+ removals.hex = changed.hex & old_state.hex;
+
+ // Get the current Pad entry
+ PadDataEntry* current_pad_entry = &pad_data->entries[pad_data->index];
+
+ // Update entry properties
+ current_pad_entry->current_state.hex = next_state.hex;
+ current_pad_entry->delta_additions.hex = additions.hex;
+ current_pad_entry->delta_removals.hex = removals.hex;
+
+ // Set circle Pad
+ current_pad_entry->circle_pad_x = next_circle_x;
+ current_pad_entry->circle_pad_y = next_circle_y;
+
+ // 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
+ Kernel::SignalEvent(event_pad_or_touch_1);
+ Kernel::SignalEvent(event_pad_or_touch_2);
+}
+
+
+// TODO(peachum):
+// Add a method for setting analog input from joystick device for the circle Pad.
+//
+// This method should:
+// * Be called after both PadButton<Press, Release>().
+// * Be called before PadUpdateComplete()
+// * Set current PadEntry.circle_pad_<axis> using analog data
+// * Set PadData.raw_circle_pad_data
+// * Set PadData.current_state.circle_right = 1 if current PadEntry.circle_pad_x >= 41
+// * Set PadData.current_state.circle_up = 1 if current PadEntry.circle_pad_y >= 41
+// * Set PadData.current_state.circle_left = 1 if current PadEntry.circle_pad_x <= -41
+// * Set PadData.current_state.circle_right = 1 if current PadEntry.circle_pad_y <= -41
+
/**
* HID_User::GetIPCHandles service function
@@ -34,12 +155,12 @@ void GetIPCHandles(Service::Interface* self) {
u32* cmd_buff = Service::GetCommandBuffer();
cmd_buff[1] = 0; // No error
- cmd_buff[3] = g_shared_mem;
- cmd_buff[4] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventA");
- cmd_buff[5] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventB");
- cmd_buff[6] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventC");
- cmd_buff[7] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventGyroscope");
- cmd_buff[8] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventD");
+ cmd_buff[3] = shared_mem;
+ cmd_buff[4] = event_pad_or_touch_1;
+ cmd_buff[5] = event_pad_or_touch_2;
+ cmd_buff[6] = event_accelerometer;
+ cmd_buff[7] = event_gyroscope;
+ cmd_buff[8] = event_debug_pad;
DEBUG_LOG(KERNEL, "called");
}
@@ -57,11 +178,19 @@ const Interface::FunctionInfo FunctionTable[] = {
{0x00170000, nullptr, "GetSoundVolume"},
};
+
////////////////////////////////////////////////////////////////////////////////////////////////////
// Interface class
Interface::Interface() {
- g_shared_mem = Kernel::CreateSharedMemory("HID_User:SharedMem"); // Create shared memory object
+ shared_mem = Kernel::CreateSharedMemory("HID_User:SharedMem"); // Create shared memory object
+
+ // Create event handles
+ event_pad_or_touch_1 = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventPadOrTouch1");
+ event_pad_or_touch_2 = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventPadOrTouch2");
+ event_accelerometer = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventAccelerometer");
+ event_gyroscope = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventGyroscope");
+ event_debug_pad = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventDebugPad");
Register(FunctionTable, ARRAY_SIZE(FunctionTable));
}
diff --git a/src/core/hle/service/hid.h b/src/core/hle/service/hid.h
index b17fcfa86..a077e25cd 100644
--- a/src/core/hle/service/hid.h
+++ b/src/core/hle/service/hid.h
@@ -5,15 +5,101 @@
#pragma once
#include "core/hle/service/service.h"
+#include "common/bit_field.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// Namespace HID_User
-// This service is used for interfacing to physical user controls... perhaps "Human Interface
-// Devices"? Uses include game pad controls, accelerometers, gyroscopes, etc.
+// This service is used for interfacing to physical user controls.
+// Uses include game pad controls, touchscreen, accelerometers, gyroscopes, and debug pad.
namespace HID_User {
+/**
+ * Structure of a Pad controller state.
+ */
+struct PadState {
+ union {
+ u32 hex;
+
+ BitField<0, 1, u32> a;
+ BitField<1, 1, u32> b;
+ BitField<2, 1, u32> select;
+ BitField<3, 1, u32> start;
+ BitField<4, 1, u32> right;
+ BitField<5, 1, u32> left;
+ BitField<6, 1, u32> up;
+ BitField<7, 1, u32> down;
+ BitField<8, 1, u32> r;
+ BitField<9, 1, u32> l;
+ BitField<10, 1, u32> x;
+ BitField<11, 1, u32> y;
+
+ BitField<28, 1, u32> circle_right;
+ BitField<29, 1, u32> circle_left;
+ BitField<30, 1, u32> circle_up;
+ BitField<31, 1, u32> circle_down;
+ };
+};
+
+/**
+ * Structure of a single entry in the PadData's Pad state history array.
+ */
+struct PadDataEntry {
+ PadState current_state;
+ PadState delta_additions;
+ PadState delta_removals;
+
+ s16 circle_pad_x;
+ s16 circle_pad_y;
+};
+
+/**
+ * Structure of all data related to the 3DS Pad.
+ */
+struct PadData {
+ s64 index_reset_ticks;
+ s64 index_reset_ticks_previous;
+ u32 index; // the index of the last updated Pad state history element
+
+ u32 pad1;
+ u32 pad2;
+
+ PadState current_state; // same as entries[index].current_state
+ u32 raw_circle_pad_data;
+
+ u32 pad3;
+
+ std::array<PadDataEntry, 8> entries; // Pad state history
+};
+
+// Pre-defined PadStates for single button presses
+const PadState PAD_NONE = {{0}};
+const PadState PAD_A = {{1u << 0}};
+const PadState PAD_B = {{1u << 1}};
+const PadState PAD_SELECT = {{1u << 2}};
+const PadState PAD_START = {{1u << 3}};
+const PadState PAD_RIGHT = {{1u << 4}};
+const PadState PAD_LEFT = {{1u << 5}};
+const PadState PAD_UP = {{1u << 6}};
+const PadState PAD_DOWN = {{1u << 7}};
+const PadState PAD_R = {{1u << 8}};
+const PadState PAD_L = {{1u << 9}};
+const PadState PAD_X = {{1u << 10}};
+const PadState PAD_Y = {{1u << 11}};
+const PadState PAD_CIRCLE_RIGHT = {{1u << 28}};
+const PadState PAD_CIRCLE_LEFT = {{1u << 29}};
+const PadState PAD_CIRCLE_UP = {{1u << 30}};
+const PadState PAD_CIRCLE_DOWN = {{1u << 31}};
+
+// Methods for updating the HID module's state
+void PadButtonPress(PadState pad_state);
+void PadButtonRelease(PadState pad_state);
+void PadUpdateComplete();
+
+/**
+ * HID service interface.
+ */
class Interface : public Service::Interface {
public:
diff --git a/src/core/hle/service/ndm.cpp b/src/core/hle/service/ndm.cpp
index 48755b6a7..f6af0a153 100644
--- a/src/core/hle/service/ndm.cpp
+++ b/src/core/hle/service/ndm.cpp
@@ -2,8 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "common/log.h"
-
#include "core/hle/hle.h"
#include "core/hle/service/ndm.h"
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 00ac1c9c6..9eb1726aa 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -3,11 +3,8 @@
// Refer to the license.txt file included.
#include "common/common.h"
-#include "common/log.h"
#include "common/string_util.h"
-#include "core/hle/hle.h"
-
#include "core/hle/service/service.h"
#include "core/hle/service/apt.h"
#include "core/hle/service/fs.h"
@@ -16,8 +13,6 @@
#include "core/hle/service/ndm.h"
#include "core/hle/service/srv.h"
-#include "core/hle/kernel/kernel.h"
-
namespace Service {
Manager* g_manager = nullptr; ///< Service manager
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index 23be3cf2c..eb2c73f93 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -4,7 +4,6 @@
#include "core/hle/hle.h"
#include "core/hle/service/srv.h"
-#include "core/hle/service/service.h"
#include "core/hle/kernel/event.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index bdcfae6f5..490e05cde 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include <map>
-#include <string>
#include "common/string_util.h"
#include "common/symbols.h"
@@ -12,13 +11,11 @@
#include "core/hle/kernel/address_arbiter.h"
#include "core/hle/kernel/event.h"
-#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/mutex.h"
#include "core/hle/kernel/shared_memory.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/function_wrappers.h"
-#include "core/hle/svc.h"
#include "core/hle/service/service.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -221,7 +218,7 @@ Result CreateThread(u32 priority, u32 entry_point, u32 arg, u32 stack_top, u32 p
TSymbol symbol = Symbols::GetSymbol(entry_point);
name = symbol.name;
} else {
- name = StringFromFormat("unknown-%08x", entry_point);
+ name = Common::StringFromFormat("unknown-%08x", entry_point);
}
Handle thread = Kernel::CreateThread(name.c_str(), entry_point, priority, arg, processor_id,
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-30 20:34:34 +0200