summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-10-18 00:09:05 +0200
committerLioncash <mathew1800@gmail.com>2019-10-18 00:09:08 +0200
commita71e8066a15fd4c4642dc6b93931faf570ba0b0b (patch)
tree780db03c4f4eeff3b3cedda7cd3ca8802b481338 /src
parentMerge pull request #2980 from lioncash/warn (diff)
downloadyuzu-a71e8066a15fd4c4642dc6b93931faf570ba0b0b.tar
yuzu-a71e8066a15fd4c4642dc6b93931faf570ba0b0b.tar.gz
yuzu-a71e8066a15fd4c4642dc6b93931faf570ba0b0b.tar.bz2
yuzu-a71e8066a15fd4c4642dc6b93931faf570ba0b0b.tar.lz
yuzu-a71e8066a15fd4c4642dc6b93931faf570ba0b0b.tar.xz
yuzu-a71e8066a15fd4c4642dc6b93931faf570ba0b0b.tar.zst
yuzu-a71e8066a15fd4c4642dc6b93931faf570ba0b0b.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/hid/controllers/npad.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index 1bc3d55d6..7da72fde3 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -301,6 +301,12 @@ private:
bool is_connected;
};
+ void InitNewlyAddedControler(std::size_t controller_idx);
+ bool IsControllerSupported(NPadControllerType controller);
+ bool IsControllerSupported(NPadControllerType controller) const;
+ NPadControllerType DecideBestController(NPadControllerType priority) const;
+ void RequestPadStateUpdate(u32 npad_id);
+
u32 press_state{};
NPadType style{};
@@ -321,12 +327,7 @@ private:
std::array<ControllerHolder, 10> connected_controllers{};
bool can_controllers_vibrate{true};
- void InitNewlyAddedControler(std::size_t controller_idx);
- bool IsControllerSupported(NPadControllerType controller) const;
- NPadControllerType DecideBestController(NPadControllerType priority) const;
- void RequestPadStateUpdate(u32 npad_id);
std::array<ControllerPad, 10> npad_pad_states{};
- bool IsControllerSupported(NPadControllerType controller);
bool is_in_lr_assignment_mode{false};
Core::System& system;
};