summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-07-19 21:09:31 +0200
committerLioncash <mathew1800@gmail.com>2018-07-19 21:11:08 +0200
commita37a47448dff6b19f1828f83f96cc8efce129d64 (patch)
tree08e96429d3d34211a359b2e14bf38fc8ddf714d6 /src/core
parenthid: Use HID_NUM_LAYOUTS constant for indicating size of the layouts array (diff)
downloadyuzu-a37a47448dff6b19f1828f83f96cc8efce129d64.tar
yuzu-a37a47448dff6b19f1828f83f96cc8efce129d64.tar.gz
yuzu-a37a47448dff6b19f1828f83f96cc8efce129d64.tar.bz2
yuzu-a37a47448dff6b19f1828f83f96cc8efce129d64.tar.lz
yuzu-a37a47448dff6b19f1828f83f96cc8efce129d64.tar.xz
yuzu-a37a47448dff6b19f1828f83f96cc8efce129d64.tar.zst
yuzu-a37a47448dff6b19f1828f83f96cc8efce129d64.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/hid/hid.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 4f18c0fd3..475a0a5cf 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -85,8 +85,7 @@ private:
controller_header.left_color_buttons = JOYCON_BUTTONS_NEON_BLUE;
for (size_t controller = 0; controller < mem.controllers.size(); controller++) {
- for (int index = 0; index < HID_NUM_LAYOUTS; index++) {
- ControllerLayout& layout = mem.controllers[controller].layouts[index];
+ for (auto& layout : mem.controllers[controller].layouts) {
layout.header.num_entries = HID_NUM_ENTRIES;
layout.header.max_entry_index = HID_NUM_ENTRIES - 1;
@@ -213,8 +212,7 @@ private:
keyboard.entries[curr_keyboard_entry].timestamp_2 = keyboard_sample_counter;
// TODO(shinyquagsire23): Figure out what any of these are
- for (size_t i = 0; i < mem.unk_input_1.size(); i++) {
- UnkInput1& input = mem.unk_input_1[i];
+ for (auto& input : mem.unk_input_1) {
const u64 last_input_entry = input.header.latest_entry;
const u64 curr_input_entry = (input.header.latest_entry + 1) % input.entries.size();
const u64 input_sample_counter = input.entries[last_input_entry].timestamp + 1;
@@ -228,9 +226,7 @@ private:
input.entries[curr_input_entry].timestamp_2 = input_sample_counter;
}
- for (size_t i = 0; i < mem.unk_input_2.size(); i++) {
- UnkInput2& input = mem.unk_input_2[i];
-
+ for (auto& input : mem.unk_input_2) {
input.header.timestamp_ticks = timestamp;
input.header.num_entries = 17;
input.header.latest_entry = 0;