yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Address feedback

This commit is contained in:
Morph 2020-08-28 12:45:15 -04:00
parent 1ec71b6ea0
commit 076e4d44c3
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/frontend/applets/controller.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/assert.h"
#include "common/logging/log.h"
#include "core/core.h" #include "core/core.h"
#include "core/frontend/applets/controller.h" #include "core/frontend/applets/controller.h"
#include "core/hle/service/hid/controllers/npad.h" #include "core/hle/service/hid/controllers/npad.h"

4
src/core/hle/service/am/applets/controller.cpp
View File

@ -3,10 +3,14 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm> #include <algorithm>
#include <cstring>
#include "common/assert.h"
#include "common/logging/log.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "core/core.h" #include "core/core.h"
#include "core/frontend/applets/controller.h" #include "core/frontend/applets/controller.h"
#include "core/hle/result.h"
#include "core/hle/service/am/am.h" #include "core/hle/service/am/am.h"
#include "core/hle/service/am/applets/controller.h" #include "core/hle/service/am/applets/controller.h"
#include "core/hle/service/hid/controllers/npad.h" #include "core/hle/service/hid/controllers/npad.h"

3
src/core/hle/service/am/applets/controller.h
View File

@ -5,7 +5,10 @@
#pragma once #pragma once
#include <array> #include <array>
#include <vector>
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "core/hle/result.h" #include "core/hle/result.h"
#include "core/hle/service/am/applets/applets.h" #include "core/hle/service/am/applets/applets.h"

5
src/yuzu/applets/controller.cpp
View File

@ -4,6 +4,7 @@
#include <algorithm> #include <algorithm>
#include "common/assert.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "core/core.h" #include "core/core.h"
#include "core/hle/lock.h" #include "core/hle/lock.h"
@ -15,6 +16,8 @@
#include "yuzu/configuration/configure_input_dialog.h" #include "yuzu/configuration/configure_input_dialog.h"
#include "yuzu/main.h" #include "yuzu/main.h"
namespace {
constexpr std::array<std::array<bool, 4>, 8> led_patterns = {{ constexpr std::array<std::array<bool, 4>, 8> led_patterns = {{
{1, 0, 0, 0}, {1, 0, 0, 0},
{1, 1, 0, 0}, {1, 1, 0, 0},
@ -26,8 +29,6 @@ constexpr std::array<std::array<bool, 4>, 8> led_patterns = {{
{0, 1, 1, 0}, {0, 1, 1, 0},
}}; }};
namespace {
void UpdateController(Settings::ControllerType controller_type, std::size_t npad_index, void UpdateController(Settings::ControllerType controller_type, std::size_t npad_index,
bool connected) { bool connected) {
Core::System& system{Core::System::GetInstance()}; Core::System& system{Core::System::GetInstance()};