diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-08-28 18:45:15 +0200 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-09-04 18:23:25 +0200 |
| commit | 076e4d44c3dbfef173e7fdc189144a554dcfe483 (patch) | |
| tree | c115cda318b3ad3d31f5c8b5832bcf9b2036b594 | |
| parent | clang-format (diff) | |
| download | yuzu-076e4d44c3dbfef173e7fdc189144a554dcfe483.tar yuzu-076e4d44c3dbfef173e7fdc189144a554dcfe483.tar.gz yuzu-076e4d44c3dbfef173e7fdc189144a554dcfe483.tar.bz2 yuzu-076e4d44c3dbfef173e7fdc189144a554dcfe483.tar.lz yuzu-076e4d44c3dbfef173e7fdc189144a554dcfe483.tar.xz yuzu-076e4d44c3dbfef173e7fdc189144a554dcfe483.tar.zst yuzu-076e4d44c3dbfef173e7fdc189144a554dcfe483.zip | |
| -rw-r--r-- | src/core/frontend/applets/controller.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/controller.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/controller.h | 3 | ||||
| -rw-r--r-- | src/yuzu/applets/controller.cpp | 5 |
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 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "common/assert.h" +#include "common/logging/log.h" #include "core/core.h" #include "core/frontend/applets/controller.h" #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 @@ // Refer to the license.txt file included. #include <algorithm> +#include <cstring> +#include "common/assert.h" +#include "common/logging/log.h" #include "common/string_util.h" #include "core/core.h" #include "core/frontend/applets/controller.h" +#include "core/hle/result.h" #include "core/hle/service/am/am.h" #include "core/hle/service/am/applets/controller.h" #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 @@ #pragma once #include <array> +#include <vector> +#include "common/common_funcs.h" +#include "common/common_types.h" #include "core/hle/result.h" #include "core/hle/service/am/applets/applets.h" 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 @@ #include <algorithm> +#include "common/assert.h" #include "common/string_util.h" #include "core/core.h" #include "core/hle/lock.h" @@ -15,6 +16,8 @@ #include "yuzu/configuration/configure_input_dialog.h" #include "yuzu/main.h" +namespace { + constexpr std::array<std::array<bool, 4>, 8> led_patterns = {{ {1, 0, 0, 0}, {1, 1, 0, 0}, @@ -26,8 +29,6 @@ constexpr std::array<std::array<bool, 4>, 8> led_patterns = {{ {0, 1, 1, 0}, }}; -namespace { - void UpdateController(Settings::ControllerType controller_type, std::size_t npad_index, bool connected) { Core::System& system{Core::System::GetInstance()}; |