summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Lioncash2019-10-17 18:09:05 -0400
committerGravatar Lioncash2019-10-17 18:09:08 -0400
commita71e8066a15fd4c4642dc6b93931faf570ba0b0b (patch)
tree780db03c4f4eeff3b3cedda7cd3ca8802b481338 /src/core
parentMerge pull request #2980 from lioncash/warn (diff)
downloadyuzu-a71e8066a15fd4c4642dc6b93931faf570ba0b0b.tar.gz
yuzu-a71e8066a15fd4c4642dc6b93931faf570ba0b0b.tar.xz
yuzu-a71e8066a15fd4c4642dc6b93931faf570ba0b0b.zip
hid/npad: Move function declarations
Clearly separate these from the variable declarations to make them more visible.
Diffstat (limited to 'src/core')
-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:
301 bool is_connected; 301 bool is_connected;
302 }; 302 };
303 303
304 void InitNewlyAddedControler(std::size_t controller_idx);
305 bool IsControllerSupported(NPadControllerType controller);
306 bool IsControllerSupported(NPadControllerType controller) const;
307 NPadControllerType DecideBestController(NPadControllerType priority) const;
308 void RequestPadStateUpdate(u32 npad_id);
309
304 u32 press_state{}; 310 u32 press_state{};
305 311
306 NPadType style{}; 312 NPadType style{};
@@ -321,12 +327,7 @@ private:
321 std::array<ControllerHolder, 10> connected_controllers{}; 327 std::array<ControllerHolder, 10> connected_controllers{};
322 bool can_controllers_vibrate{true}; 328 bool can_controllers_vibrate{true};
323 329
324 void InitNewlyAddedControler(std::size_t controller_idx);
325 bool IsControllerSupported(NPadControllerType controller) const;
326 NPadControllerType DecideBestController(NPadControllerType priority) const;
327 void RequestPadStateUpdate(u32 npad_id);
328 std::array<ControllerPad, 10> npad_pad_states{}; 330 std::array<ControllerPad, 10> npad_pad_states{};
329 bool IsControllerSupported(NPadControllerType controller);
330 bool is_in_lr_assignment_mode{false}; 331 bool is_in_lr_assignment_mode{false};
331 Core::System& system; 332 Core::System& system;
332}; 333};