diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 8 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/touchscreen.h | 7 |
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 | ||
| 12 | namespace Input { | ||
| 13 | template <typename StatusType> | ||
| 14 | class InputDevice; | ||
| 15 | using ButtonDevice = InputDevice<bool>; | ||
| 16 | using AnalogDevice = InputDevice<std::tuple<float, float>>; | ||
| 17 | } // namespace Input | ||
| 18 | |||
| 19 | namespace Service::HID { | 13 | namespace Service::HID { |
| 20 | 14 | ||
| 21 | class Controller_NPad final : public ControllerBase { | 15 | 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 @@ | |||
| 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 | ||
| 12 | namespace Input { | ||
| 13 | template <typename StatusType> | ||
| 14 | class InputDevice; | ||
| 15 | using TouchDevice = InputDevice<std::tuple<float, float, bool>>; | ||
| 16 | } // namespace Input | ||
| 17 | |||
| 18 | namespace Service::HID { | 13 | namespace Service::HID { |
| 19 | class Controller_Touchscreen final : public ControllerBase { | 14 | class Controller_Touchscreen final : public ControllerBase { |
| 20 | public: | 15 | public: |