summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2018-10-06 05:27:06 +0200
committerDavid Marcec <dmarcecguzman@gmail.com>2018-10-10 04:15:37 +0200
commitb79c294c0290886266e8c9059314903c38978db6 (patch)
treedc2dc07272a7bb7e9118345d446d8a182025269b /src/core/hle/service/hid
parentAddressed changes for better hid (diff)
downloadyuzu-b79c294c0290886266e8c9059314903c38978db6.tar
yuzu-b79c294c0290886266e8c9059314903c38978db6.tar.gz
yuzu-b79c294c0290886266e8c9059314903c38978db6.tar.bz2
yuzu-b79c294c0290886266e8c9059314903c38978db6.tar.lz
yuzu-b79c294c0290886266e8c9059314903c38978db6.tar.xz
yuzu-b79c294c0290886266e8c9059314903c38978db6.tar.zst
yuzu-b79c294c0290886266e8c9059314903c38978db6.zip
Diffstat (limited to 'src/core/hle/service/hid')
-rw-r--r--src/core/hle/service/hid/controllers/npad.h8
-rw-r--r--src/core/hle/service/hid/controllers/touchscreen.h7
2 files changed, 2 insertions, 13 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index e5c212aa5..2d1614747 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -6,16 +6,10 @@
#include <array>
#include "common/common_types.h"
+#include "core/frontend/input.h"
#include "core/hle/service/hid/controllers/controller_base.h"
#include "core/settings.h"
-namespace Input {
-template <typename StatusType>
-class InputDevice;
-using ButtonDevice = InputDevice<bool>;
-using AnalogDevice = InputDevice<std::tuple<float, float>>;
-} // namespace Input
-
namespace Service::HID {
class Controller_NPad final : public ControllerBase {
diff --git a/src/core/hle/service/hid/controllers/touchscreen.h b/src/core/hle/service/hid/controllers/touchscreen.h
index 82a3d4a1a..1d97b6c2a 100644
--- a/src/core/hle/service/hid/controllers/touchscreen.h
+++ b/src/core/hle/service/hid/controllers/touchscreen.h
@@ -7,14 +7,9 @@
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "common/swap.h"
+#include "core/frontend/input.h"
#include "core/hle/service/hid/controllers/controller_base.h"
-namespace Input {
-template <typename StatusType>
-class InputDevice;
-using TouchDevice = InputDevice<std::tuple<float, float, bool>>;
-} // namespace Input
-
namespace Service::HID {
class Controller_Touchscreen final : public ControllerBase {
public: