summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/frontend/applets/controller.cpp2
-rw-r--r--src/core/hle/service/am/applets/controller.cpp4
-rw-r--r--src/core/hle/service/am/applets/controller.h3
-rw-r--r--src/yuzu/applets/controller.cpp5
4 files changed, 12 insertions, 2 deletions
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp
index 715d9fffd..31a5cb2cc 100644
--- a/src/core/frontend/applets/controller.cpp
+++ b/src/core/frontend/applets/controller.cpp
@@ -2,6 +2,8 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common/assert.h"
6#include "common/logging/log.h"
5#include "core/core.h" 7#include "core/core.h"
6#include "core/frontend/applets/controller.h" 8#include "core/frontend/applets/controller.h"
7#include "core/hle/service/hid/controllers/npad.h" 9#include "core/hle/service/hid/controllers/npad.h"
diff --git a/src/core/hle/service/am/applets/controller.cpp b/src/core/hle/service/am/applets/controller.cpp
index 6edb35704..2151da783 100644
--- a/src/core/hle/service/am/applets/controller.cpp
+++ b/src/core/hle/service/am/applets/controller.cpp
@@ -3,10 +3,14 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <algorithm> 5#include <algorithm>
6#include <cstring>
6 7
8#include "common/assert.h"
9#include "common/logging/log.h"
7#include "common/string_util.h" 10#include "common/string_util.h"
8#include "core/core.h" 11#include "core/core.h"
9#include "core/frontend/applets/controller.h" 12#include "core/frontend/applets/controller.h"
13#include "core/hle/result.h"
10#include "core/hle/service/am/am.h" 14#include "core/hle/service/am/am.h"
11#include "core/hle/service/am/applets/controller.h" 15#include "core/hle/service/am/applets/controller.h"
12#include "core/hle/service/hid/controllers/npad.h" 16#include "core/hle/service/hid/controllers/npad.h"
diff --git a/src/core/hle/service/am/applets/controller.h b/src/core/hle/service/am/applets/controller.h
index 31ba2af4f..f7bb3fba9 100644
--- a/src/core/hle/service/am/applets/controller.h
+++ b/src/core/hle/service/am/applets/controller.h
@@ -5,7 +5,10 @@
5#pragma once 5#pragma once
6 6
7#include <array> 7#include <array>
8#include <vector>
8 9
10#include "common/common_funcs.h"
11#include "common/common_types.h"
9#include "core/hle/result.h" 12#include "core/hle/result.h"
10#include "core/hle/service/am/applets/applets.h" 13#include "core/hle/service/am/applets/applets.h"
11 14
diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/controller.cpp
index f2690b8dc..c960eb3dd 100644
--- a/src/yuzu/applets/controller.cpp
+++ b/src/yuzu/applets/controller.cpp
@@ -4,6 +4,7 @@
4 4
5#include <algorithm> 5#include <algorithm>
6 6
7#include "common/assert.h"
7#include "common/string_util.h" 8#include "common/string_util.h"
8#include "core/core.h" 9#include "core/core.h"
9#include "core/hle/lock.h" 10#include "core/hle/lock.h"
@@ -15,6 +16,8 @@
15#include "yuzu/configuration/configure_input_dialog.h" 16#include "yuzu/configuration/configure_input_dialog.h"
16#include "yuzu/main.h" 17#include "yuzu/main.h"
17 18
19namespace {
20
18constexpr std::array<std::array<bool, 4>, 8> led_patterns = {{ 21constexpr std::array<std::array<bool, 4>, 8> led_patterns = {{
19 {1, 0, 0, 0}, 22 {1, 0, 0, 0},
20 {1, 1, 0, 0}, 23 {1, 1, 0, 0},
@@ -26,8 +29,6 @@ constexpr std::array<std::array<bool, 4>, 8> led_patterns = {{
26 {0, 1, 1, 0}, 29 {0, 1, 1, 0},
27}}; 30}};
28 31
29namespace {
30
31void UpdateController(Settings::ControllerType controller_type, std::size_t npad_index, 32void UpdateController(Settings::ControllerType controller_type, std::size_t npad_index,
32 bool connected) { 33 bool connected) {
33 Core::System& system{Core::System::GetInstance()}; 34 Core::System& system{Core::System::GetInstance()};