summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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 @@
6 6
7#include <array> 7#include <array>
8#include "common/common_types.h" 8#include "common/common_types.h"
9#include "core/frontend/input.h"
9#include "core/hle/service/hid/controllers/controller_base.h" 10#include "core/hle/service/hid/controllers/controller_base.h"
10#include "core/settings.h" 11#include "core/settings.h"
11 12
12namespace Input {
13template <typename StatusType>
14class InputDevice;
15using ButtonDevice = InputDevice<bool>;
16using AnalogDevice = InputDevice<std::tuple<float, float>>;
17} // namespace Input
18
19namespace Service::HID { 13namespace Service::HID {
20 14
21class Controller_NPad final : public ControllerBase { 15class 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 @@
7#include "common/common_funcs.h" 7#include "common/common_funcs.h"
8#include "common/common_types.h" 8#include "common/common_types.h"
9#include "common/swap.h" 9#include "common/swap.h"
10#include "core/frontend/input.h"
10#include "core/hle/service/hid/controllers/controller_base.h" 11#include "core/hle/service/hid/controllers/controller_base.h"
11 12
12namespace Input {
13template <typename StatusType>
14class InputDevice;
15using TouchDevice = InputDevice<std::tuple<float, float, bool>>;
16} // namespace Input
17
18namespace Service::HID { 13namespace Service::HID {
19class Controller_Touchscreen final : public ControllerBase { 14class Controller_Touchscreen final : public ControllerBase {
20public: 15public: