15 files changed, 378 insertions, 264 deletions

diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index a6282809b..9d1adc2fa 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -27,7 +27,7 @@ void EmuWindow_GLFW::OnKeyEvent(GLFWwindow* win, int key, int scancode, int acti
         EmuWindow::KeyReleased({key, keyboard_id});
     }
 
-    HID_User::PadUpdateComplete();
+    Service::HID::PadUpdateComplete();
 }
 
 /// Whether the window is still open, and a close request hasn't yet been sent
@@ -127,22 +127,22 @@ void EmuWindow_GLFW::DoneCurrent() {
 }
 
 void EmuWindow_GLFW::ReloadSetKeymaps() {
-    KeyMap::SetKeyMapping({Settings::values.pad_a_key,      keyboard_id}, HID_User::PAD_A);
-    KeyMap::SetKeyMapping({Settings::values.pad_b_key,      keyboard_id}, HID_User::PAD_B);
-    KeyMap::SetKeyMapping({Settings::values.pad_select_key, keyboard_id}, HID_User::PAD_SELECT);
-    KeyMap::SetKeyMapping({Settings::values.pad_start_key,  keyboard_id}, HID_User::PAD_START);
-    KeyMap::SetKeyMapping({Settings::values.pad_dright_key, keyboard_id}, HID_User::PAD_RIGHT);
-    KeyMap::SetKeyMapping({Settings::values.pad_dleft_key,  keyboard_id}, HID_User::PAD_LEFT);
-    KeyMap::SetKeyMapping({Settings::values.pad_dup_key,    keyboard_id}, HID_User::PAD_UP);
-    KeyMap::SetKeyMapping({Settings::values.pad_ddown_key,  keyboard_id}, HID_User::PAD_DOWN);
-    KeyMap::SetKeyMapping({Settings::values.pad_r_key,      keyboard_id}, HID_User::PAD_R);
-    KeyMap::SetKeyMapping({Settings::values.pad_l_key,      keyboard_id}, HID_User::PAD_L);
-    KeyMap::SetKeyMapping({Settings::values.pad_x_key,      keyboard_id}, HID_User::PAD_X);
-    KeyMap::SetKeyMapping({Settings::values.pad_y_key,      keyboard_id}, HID_User::PAD_Y);
-    KeyMap::SetKeyMapping({Settings::values.pad_sright_key, keyboard_id}, HID_User::PAD_CIRCLE_RIGHT);
-    KeyMap::SetKeyMapping({Settings::values.pad_sleft_key,  keyboard_id}, HID_User::PAD_CIRCLE_LEFT);
-    KeyMap::SetKeyMapping({Settings::values.pad_sup_key,    keyboard_id}, HID_User::PAD_CIRCLE_UP);
-    KeyMap::SetKeyMapping({Settings::values.pad_sdown_key,  keyboard_id}, HID_User::PAD_CIRCLE_DOWN);
+    KeyMap::SetKeyMapping({Settings::values.pad_a_key,      keyboard_id}, Service::HID::PAD_A);
+    KeyMap::SetKeyMapping({Settings::values.pad_b_key,      keyboard_id}, Service::HID::PAD_B);
+    KeyMap::SetKeyMapping({Settings::values.pad_select_key, keyboard_id}, Service::HID::PAD_SELECT);
+    KeyMap::SetKeyMapping({Settings::values.pad_start_key,  keyboard_id}, Service::HID::PAD_START);
+    KeyMap::SetKeyMapping({Settings::values.pad_dright_key, keyboard_id}, Service::HID::PAD_RIGHT);
+    KeyMap::SetKeyMapping({Settings::values.pad_dleft_key,  keyboard_id}, Service::HID::PAD_LEFT);
+    KeyMap::SetKeyMapping({Settings::values.pad_dup_key,    keyboard_id}, Service::HID::PAD_UP);
+    KeyMap::SetKeyMapping({Settings::values.pad_ddown_key,  keyboard_id}, Service::HID::PAD_DOWN);
+    KeyMap::SetKeyMapping({Settings::values.pad_r_key,      keyboard_id}, Service::HID::PAD_R);
+    KeyMap::SetKeyMapping({Settings::values.pad_l_key,      keyboard_id}, Service::HID::PAD_L);
+    KeyMap::SetKeyMapping({Settings::values.pad_x_key,      keyboard_id}, Service::HID::PAD_X);
+    KeyMap::SetKeyMapping({Settings::values.pad_y_key,      keyboard_id}, Service::HID::PAD_Y);
+    KeyMap::SetKeyMapping({Settings::values.pad_sright_key, keyboard_id}, Service::HID::PAD_CIRCLE_RIGHT);
+    KeyMap::SetKeyMapping({Settings::values.pad_sleft_key,  keyboard_id}, Service::HID::PAD_CIRCLE_LEFT);
+    KeyMap::SetKeyMapping({Settings::values.pad_sup_key,    keyboard_id}, Service::HID::PAD_CIRCLE_UP);
+    KeyMap::SetKeyMapping({Settings::values.pad_sdown_key,  keyboard_id}, Service::HID::PAD_CIRCLE_DOWN);
 }
 
 void EmuWindow_GLFW::OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) {
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 196380105..22a7842bf 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -268,33 +268,33 @@ QByteArray GRenderWindow::saveGeometry()
 void GRenderWindow::keyPressEvent(QKeyEvent* event)
 {
     EmuWindow::KeyPressed({event->key(), keyboard_id});
-    HID_User::PadUpdateComplete();
+    Service::HID::PadUpdateComplete();
 }
 
 void GRenderWindow::keyReleaseEvent(QKeyEvent* event)
 {
     EmuWindow::KeyReleased({event->key(), keyboard_id});
-    HID_User::PadUpdateComplete();
+    Service::HID::PadUpdateComplete();
 }
 
 void GRenderWindow::ReloadSetKeymaps()
 {
-    KeyMap::SetKeyMapping({Settings::values.pad_a_key,      keyboard_id}, HID_User::PAD_A);
-    KeyMap::SetKeyMapping({Settings::values.pad_b_key,      keyboard_id}, HID_User::PAD_B);
-    KeyMap::SetKeyMapping({Settings::values.pad_select_key, keyboard_id}, HID_User::PAD_SELECT);
-    KeyMap::SetKeyMapping({Settings::values.pad_start_key,  keyboard_id}, HID_User::PAD_START);
-    KeyMap::SetKeyMapping({Settings::values.pad_dright_key, keyboard_id}, HID_User::PAD_RIGHT);
-    KeyMap::SetKeyMapping({Settings::values.pad_dleft_key,  keyboard_id}, HID_User::PAD_LEFT);
-    KeyMap::SetKeyMapping({Settings::values.pad_dup_key,    keyboard_id}, HID_User::PAD_UP);
-    KeyMap::SetKeyMapping({Settings::values.pad_ddown_key,  keyboard_id}, HID_User::PAD_DOWN);
-    KeyMap::SetKeyMapping({Settings::values.pad_r_key,      keyboard_id}, HID_User::PAD_R);
-    KeyMap::SetKeyMapping({Settings::values.pad_l_key,      keyboard_id}, HID_User::PAD_L);
-    KeyMap::SetKeyMapping({Settings::values.pad_x_key,      keyboard_id}, HID_User::PAD_X);
-    KeyMap::SetKeyMapping({Settings::values.pad_y_key,      keyboard_id}, HID_User::PAD_Y);
-    KeyMap::SetKeyMapping({Settings::values.pad_sright_key, keyboard_id}, HID_User::PAD_CIRCLE_RIGHT);
-    KeyMap::SetKeyMapping({Settings::values.pad_sleft_key,  keyboard_id}, HID_User::PAD_CIRCLE_LEFT);
-    KeyMap::SetKeyMapping({Settings::values.pad_sup_key,    keyboard_id}, HID_User::PAD_CIRCLE_UP);
-    KeyMap::SetKeyMapping({Settings::values.pad_sdown_key,  keyboard_id}, HID_User::PAD_CIRCLE_DOWN);
+    KeyMap::SetKeyMapping({Settings::values.pad_a_key,      keyboard_id}, Service::HID::PAD_A);
+    KeyMap::SetKeyMapping({Settings::values.pad_b_key,      keyboard_id}, Service::HID::PAD_B);
+    KeyMap::SetKeyMapping({Settings::values.pad_select_key, keyboard_id}, Service::HID::PAD_SELECT);
+    KeyMap::SetKeyMapping({Settings::values.pad_start_key,  keyboard_id}, Service::HID::PAD_START);
+    KeyMap::SetKeyMapping({Settings::values.pad_dright_key, keyboard_id}, Service::HID::PAD_RIGHT);
+    KeyMap::SetKeyMapping({Settings::values.pad_dleft_key,  keyboard_id}, Service::HID::PAD_LEFT);
+    KeyMap::SetKeyMapping({Settings::values.pad_dup_key,    keyboard_id}, Service::HID::PAD_UP);
+    KeyMap::SetKeyMapping({Settings::values.pad_ddown_key,  keyboard_id}, Service::HID::PAD_DOWN);
+    KeyMap::SetKeyMapping({Settings::values.pad_r_key,      keyboard_id}, Service::HID::PAD_R);
+    KeyMap::SetKeyMapping({Settings::values.pad_l_key,      keyboard_id}, Service::HID::PAD_L);
+    KeyMap::SetKeyMapping({Settings::values.pad_x_key,      keyboard_id}, Service::HID::PAD_X);
+    KeyMap::SetKeyMapping({Settings::values.pad_y_key,      keyboard_id}, Service::HID::PAD_Y);
+    KeyMap::SetKeyMapping({Settings::values.pad_sright_key, keyboard_id}, Service::HID::PAD_CIRCLE_RIGHT);
+    KeyMap::SetKeyMapping({Settings::values.pad_sleft_key,  keyboard_id}, Service::HID::PAD_CIRCLE_LEFT);
+    KeyMap::SetKeyMapping({Settings::values.pad_sup_key,    keyboard_id}, Service::HID::PAD_CIRCLE_UP);
+    KeyMap::SetKeyMapping({Settings::values.pad_sdown_key,  keyboard_id}, Service::HID::PAD_CIRCLE_DOWN);
 }
 
 void GRenderWindow::OnClientAreaResized(unsigned width, unsigned height)
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index 4ec7b263a..48bb35db5 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -5,13 +5,13 @@
 #include "emu_window.h"
 
 void EmuWindow::KeyPressed(KeyMap::HostDeviceKey key) {
-    HID_User::PadState mapped_key = KeyMap::GetPadKey(key);
+    Service::HID::PadState mapped_key = KeyMap::GetPadKey(key);
 
-    HID_User::PadButtonPress(mapped_key);
+    Service::HID::PadButtonPress(mapped_key);
 }
 
 void EmuWindow::KeyReleased(KeyMap::HostDeviceKey key) {
-    HID_User::PadState mapped_key = KeyMap::GetPadKey(key);
+    Service::HID::PadState mapped_key = KeyMap::GetPadKey(key);
 
-    HID_User::PadButtonRelease(mapped_key);
+    Service::HID::PadButtonRelease(mapped_key);
 }
diff --git a/src/common/key_map.cpp b/src/common/key_map.cpp
index d8945bb13..844d5df68 100644
--- a/src/common/key_map.cpp
+++ b/src/common/key_map.cpp
@@ -7,18 +7,18 @@
 
 namespace KeyMap {
 
-static std::map<HostDeviceKey, HID_User::PadState> key_map;
+static std::map<HostDeviceKey, Service::HID::PadState> key_map;
 static int next_device_id = 0;
 
 int NewDeviceId() {
     return next_device_id++;
 }
 
-void SetKeyMapping(HostDeviceKey key, HID_User::PadState padState) {
+void SetKeyMapping(HostDeviceKey key, Service::HID::PadState padState) {
     key_map[key].hex = padState.hex;
 }
 
-HID_User::PadState GetPadKey(HostDeviceKey key) {
+Service::HID::PadState GetPadKey(HostDeviceKey key) {
     return key_map[key];
 }
 
diff --git a/src/common/key_map.h b/src/common/key_map.h
index 8d949b852..0ecec714f 100644
--- a/src/common/key_map.h
+++ b/src/common/key_map.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "core/hle/service/hid_user.h"
+#include "core/hle/service/hid/hid.h"
 
 namespace KeyMap {
 
@@ -35,11 +35,11 @@ int NewDeviceId();
 /**
  * Maps a device-specific key to a PadState.
  */
-void SetKeyMapping(HostDeviceKey key, HID_User::PadState padState);
+void SetKeyMapping(HostDeviceKey key, Service::HID::PadState padState);
 
 /**
  * Gets the PadState that's mapped to the provided device-specific key.
  */
-HID_User::PadState GetPadKey(HostDeviceKey key);
+Service::HID::PadState GetPadKey(HostDeviceKey key);
 
 }
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 0fc8bf318..ee4238d2e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -53,7 +53,9 @@ set(SRCS
             hle/service/fs/archive.cpp
             hle/service/fs/fs_user.cpp
             hle/service/gsp_gpu.cpp
-            hle/service/hid_user.cpp
+            hle/service/hid/hid.cpp
+            hle/service/hid/hid_user.cpp
+            hle/service/hid/hid_spvr.cpp
             hle/service/http_c.cpp
             hle/service/ir_rst.cpp
             hle/service/ir_u.cpp
@@ -150,7 +152,9 @@ set(HEADERS
             hle/service/fs/archive.h
             hle/service/fs/fs_user.h
             hle/service/gsp_gpu.h
-            hle/service/hid_user.h
+            hle/service/hid/hid.h
+            hle/service/hid/hid_spvr.h
+            hle/service/hid/hid_user.h
             hle/service/http_c.h
             hle/service/ir_rst.h
             hle/service/ir_u.h
diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp
index 11570c8b4..5a2edeb4a 100644
--- a/src/core/hle/hle.cpp
+++ b/src/core/hle/hle.cpp
@@ -12,6 +12,7 @@
 #include "core/hle/service/service.h"
 #include "core/hle/service/fs/archive.h"
 #include "core/hle/service/cfg/cfg.h"
+#include "core/hle/service/hid/hid.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -70,6 +71,7 @@ void Init() {
     Service::Init();
     Service::FS::ArchiveInit();
     Service::CFG::CFGInit();
+    Service::HID::HIDInit();
 
     RegisterAllModules();
 
@@ -79,6 +81,7 @@ void Init() {
 }
 
 void Shutdown() {
+    Service::HID::HIDShutdown();
     Service::CFG::CFGShutdown();
     Service::FS::ArchiveShutdown();
     Service::Shutdown();
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
new file mode 100644
index 000000000..5abcb2596
--- /dev/null
+++ b/src/core/hle/service/hid/hid.cpp
@@ -0,0 +1,138 @@
+// Copyright 2015 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "core/hle/service/hid/hid.h"
+
+#include "core/arm/arm_interface.h"
+#include "core/hle/kernel/event.h"
+#include "core/hle/kernel/shared_memory.h"
+#include "core/hle/hle.h"
+
+namespace Service {
+namespace HID {
+
+Handle g_shared_mem = 0;
+
+Handle g_event_pad_or_touch_1 = 0;
+Handle g_event_pad_or_touch_2 = 0;
+Handle g_event_accelerometer = 0;
+Handle g_event_gyroscope = 0;
+Handle g_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() {
+    return reinterpret_cast<PadData*>(Kernel::GetSharedMemoryPointer(g_shared_mem, 0).ValueOr(nullptr));
+}
+
+/**
+ * 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.
+ */
+static 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(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() {
+    PadData* pad_data = GetPadData();
+
+    if (pad_data == nullptr) {
+        return;
+    }
+
+    // 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(g_event_pad_or_touch_1);
+    Kernel::SignalEvent(g_event_pad_or_touch_2);
+}
+
+void HIDInit() {
+    g_shared_mem = Kernel::CreateSharedMemory("HID:SharedMem"); // Create shared memory object
+
+    // Create event handles
+    g_event_pad_or_touch_1 = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID:EventPadOrTouch1");
+    g_event_pad_or_touch_2 = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID:EventPadOrTouch2");
+    g_event_accelerometer = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID:EventAccelerometer");
+    g_event_gyroscope = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID:EventGyroscope");
+    g_event_debug_pad = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID:EventDebugPad");
+}
+
+void HIDShutdown() {
+
+}
+
+}
+}
diff --git a/src/core/hle/service/hid_user.h b/src/core/hle/service/hid/hid.h
index 5b96dda60..73cdaa527 100644
--- a/src/core/hle/service/hid_user.h
+++ b/src/core/hle/service/hid/hid.h
@@ -1,19 +1,26 @@
-// Copyright 2014 Citra Emulator Project
+// Copyright 2015 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #pragma once
 
-#include "core/hle/service/service.h"
+#include <array>
+
+#include "core/hle/kernel/kernel.h"
 #include "common/bit_field.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Namespace HID_User
+namespace Service {
+namespace HID {
 
-// This service is used for interfacing to physical user controls.
-// Uses include game pad controls, touchscreen, accelerometers, gyroscopes, and debug pad.
+// Handle to shared memory region designated to HID_User service
+extern Handle g_shared_mem;
 
-namespace HID_User {
+// Event handles
+extern Handle g_event_pad_or_touch_1;
+extern Handle g_event_pad_or_touch_2;
+extern Handle g_event_accelerometer;
+extern Handle g_event_gyroscope;
+extern Handle g_event_debug_pad;
 
 /**
  * Structure of a Pad controller state.
@@ -97,16 +104,8 @@ void PadButtonPress(const PadState& pad_state);
 void PadButtonRelease(const PadState& pad_state);
 void PadUpdateComplete();
 
-/**
- * HID service interface.
- */
-class Interface : public Service::Interface {
-public:
-    Interface();
-
-    std::string GetPortName() const override {
-        return "hid:USER";
-    }
-};
+void HIDInit();
+void HIDShutdown();
 
-} // namespace
+}
+}
diff --git a/src/core/hle/service/hid/hid_spvr.cpp b/src/core/hle/service/hid/hid_spvr.cpp
new file mode 100644
index 000000000..76c40b659
--- /dev/null
+++ b/src/core/hle/service/hid/hid_spvr.cpp
@@ -0,0 +1,38 @@
+// Copyright 2015 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "common/log.h"
+#include "core/hle/hle.h"
+#include "core/hle/service/hid/hid_spvr.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace HID_SPVR
+
+namespace HID_User {
+    extern void GetIPCHandles(Service::Interface* self);
+}
+
+namespace HID_SPVR {
+
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x000A0000, HID_User::GetIPCHandles,    "GetIPCHandles"},
+    {0x000B0000, nullptr,                    "StartAnalogStickCalibration"},
+    {0x000E0000, nullptr,                    "GetAnalogStickCalibrateParam"},
+    {0x00110000, nullptr,                    "EnableAccelerometer"},
+    {0x00120000, nullptr,                    "DisableAccelerometer"},
+    {0x00130000, nullptr,                    "EnableGyroscopeLow"},
+    {0x00140000, nullptr,                    "DisableGyroscopeLow"},
+    {0x00150000, nullptr,                    "GetGyroscopeLowRawToDpsCoefficient"},
+    {0x00160000, nullptr,                    "GetGyroscopeLowCalibrateParam"},
+    {0x00170000, nullptr,                    "GetSoundVolume"},
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+
+Interface::Interface() {
+    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+    
+} // namespace
diff --git a/src/core/hle/service/hid/hid_spvr.h b/src/core/hle/service/hid/hid_spvr.h
new file mode 100644
index 000000000..53ddc8569
--- /dev/null
+++ b/src/core/hle/service/hid/hid_spvr.h
@@ -0,0 +1,23 @@
+// Copyright 2015 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "core/hle/service/service.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace HID_SPVR
+
+namespace HID_SPVR {
+
+class Interface : public Service::Interface {
+public:
+    Interface();
+
+    std::string GetPortName() const override {
+        return "hid:SPVR";
+    }
+};
+
+} // namespace
diff --git a/src/core/hle/service/hid/hid_user.cpp b/src/core/hle/service/hid/hid_user.cpp
new file mode 100644
index 000000000..3a6275707
--- /dev/null
+++ b/src/core/hle/service/hid/hid_user.cpp
@@ -0,0 +1,75 @@
+// Copyright 2015 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "common/log.h"
+
+#include "core/hle/hle.h"
+#include "core/hle/service/hid/hid.h"
+#include "hid_user.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace HID_User
+
+namespace HID_User {
+
+
+// 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
+ *  Inputs:
+ *      None
+ *  Outputs:
+ *      1 : Result of function, 0 on success, otherwise error code
+ *      2 : Unused
+ *      3 : Handle to HID_User shared memory
+ *      4 : Event signaled by HID_User
+ *      5 : Event signaled by HID_User
+ *      6 : Event signaled by HID_User
+ *      7 : Gyroscope event
+ *      8 : Event signaled by HID_User
+ */
+void GetIPCHandles(Service::Interface* self) {
+    u32* cmd_buff = Kernel::GetCommandBuffer();
+
+    cmd_buff[1] = 0; // No error
+    cmd_buff[3] = Service::HID::g_shared_mem;
+    cmd_buff[4] = Service::HID::g_event_pad_or_touch_1;
+    cmd_buff[5] = Service::HID::g_event_pad_or_touch_2;
+    cmd_buff[6] = Service::HID::g_event_accelerometer;
+    cmd_buff[7] = Service::HID::g_event_gyroscope;
+    cmd_buff[8] = Service::HID::g_event_debug_pad;
+}
+
+const Interface::FunctionInfo FunctionTable[] = {
+    {0x000A0000, GetIPCHandles, "GetIPCHandles"},
+    {0x00110000, nullptr,       "EnableAccelerometer"},
+    {0x00120000, nullptr,       "DisableAccelerometer"},
+    {0x00130000, nullptr,       "EnableGyroscopeLow"},
+    {0x00140000, nullptr,       "DisableGyroscopeLow"},
+    {0x00150000, nullptr,       "GetGyroscopeLowRawToDpsCoefficient"},
+    {0x00160000, nullptr,       "GetGyroscopeLowCalibrateParam"},
+    {0x00170000, nullptr,       "GetSoundVolume"},
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Interface class
+
+Interface::Interface() {
+    Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+}
+
+} // namespace
diff --git a/src/core/hle/service/hid/hid_user.h b/src/core/hle/service/hid/hid_user.h
new file mode 100644
index 000000000..1d9929e67
--- /dev/null
+++ b/src/core/hle/service/hid/hid_user.h
@@ -0,0 +1,29 @@
+// Copyright 2015 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "core/hle/service/service.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace HID_User
+
+// This service is used for interfacing to physical user controls.
+// Uses include game pad controls, touchscreen, accelerometers, gyroscopes, and debug pad.
+
+namespace HID_User {
+
+/**
+ * HID service interface.
+ */
+class Interface : public Service::Interface {
+public:
+    Interface();
+
+    std::string GetPortName() const override {
+        return "hid:USER";
+    }
+};
+
+} // namespace
diff --git a/src/core/hle/service/hid_user.cpp b/src/core/hle/service/hid_user.cpp
deleted file mode 100644
index 1403b1de9..000000000
--- a/src/core/hle/service/hid_user.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "common/log.h"
-
-#include "core/arm/arm_interface.h"
-#include "core/hle/hle.h"
-#include "core/hle/kernel/event.h"
-#include "core/hle/kernel/shared_memory.h"
-#include "hid_user.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Namespace HID_User
-
-namespace HID_User {
-
-// 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() {
-    return reinterpret_cast<PadData*>(Kernel::GetSharedMemoryPointer(shared_mem, 0).ValueOr(nullptr));
-}
-
-/**
- * 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.
- */
-static 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(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() {
-    PadData* pad_data = GetPadData();
-
-    if (pad_data == nullptr) {
-        return;
-    }
-
-    // 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
- *  Inputs:
- *      None
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- *      2 : Unused
- *      3 : Handle to HID_User shared memory
- *      4 : Event signaled by HID_User
- *      5 : Event signaled by HID_User
- *      6 : Event signaled by HID_User
- *      7 : Gyroscope event
- *      8 : Event signaled by HID_User
- */
-static void GetIPCHandles(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    cmd_buff[1] = 0; // No error
-    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;
-}
-
-const Interface::FunctionInfo FunctionTable[] = {
-    {0x000A0000, GetIPCHandles, "GetIPCHandles"},
-    {0x000B0000, nullptr,       "StartAnalogStickCalibration"},
-    {0x000E0000, nullptr,       "GetAnalogStickCalibrateParam"},
-    {0x00110000, nullptr,       "EnableAccelerometer"},
-    {0x00120000, nullptr,       "DisableAccelerometer"},
-    {0x00130000, nullptr,       "EnableGyroscopeLow"},
-    {0x00140000, nullptr,       "DisableGyroscopeLow"},
-    {0x00150000, nullptr,       "GetGyroscopeLowRawToDpsCoefficient"},
-    {0x00160000, nullptr,       "GetGyroscopeLowCalibrateParam"},
-    {0x00170000, nullptr,       "GetSoundVolume"},
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Interface class
-
-Interface::Interface() {
-    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));
-}
-
-} // namespace
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 446ed5164..b685fc905 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -24,7 +24,8 @@
 #include "core/hle/service/fs/fs_user.h"
 #include "core/hle/service/frd_u.h"
 #include "core/hle/service/gsp_gpu.h"
-#include "core/hle/service/hid_user.h"
+#include "core/hle/service/hid/hid_spvr.h"
+#include "core/hle/service/hid/hid_user.h"
 #include "core/hle/service/http_c.h"
 #include "core/hle/service/ir_rst.h"
 #include "core/hle/service/ir_u.h"
@@ -101,6 +102,7 @@ void Init() {
     g_manager->AddService(new FRD_U::Interface);
     g_manager->AddService(new FS::FSUserInterface);
     g_manager->AddService(new GSP_GPU::Interface);
+    g_manager->AddService(new HID_SPVR::Interface);
     g_manager->AddService(new HID_User::Interface);
     g_manager->AddService(new HTTP_C::Interface);
     g_manager->AddService(new IR_RST::Interface);