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

hid/controller/npad: Move npad_id_list into the cpp file 

This is just a lookup table, and since it's private, there's nothing
really stateful about it, so we can just move it into the cpp file.
This commit is contained in:
Lioncash 2018-10-17 20:41:45 -04:00
parent aeca224890
commit aeda743446
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/hle/service/hid/controllers/npad.cpp
View File

@ -20,6 +20,7 @@
#include "core/settings.h"
namespace Service::HID {
constexpr u32 JOYCON_BODY_NEON_RED = 0xFF3C28;
constexpr u32 JOYCON_BUTTONS_NEON_RED = 0x1E0A0A;
constexpr u32 JOYCON_BODY_NEON_BLUE = 0x0AB9E6;
@ -28,7 +29,15 @@ constexpr s32 HID_JOYSTICK_MAX = 0x7fff;
constexpr s32 HID_JOYSTICK_MIN = -0x7fff;
constexpr std::size_t NPAD_OFFSET = 0x9A00;
constexpr u32 BATTERY_FULL = 2;
enum class JoystickId : std::size_t { Joystick_Left, Joystick_Right };
constexpr std::array<u32, 10> npad_id_list{
0, 1, 2, 3, 4, 5, 6, 7, 32, 16,
};
enum class JoystickId : std::size_t {
Joystick_Left,
Joystick_Right,
};
Controller_NPad::Controller_NPad() = default;
Controller_NPad::~Controller_NPad() = default;

1
src/core/hle/service/hid/controllers/npad.h
View File

@ -280,7 +280,6 @@ private:
Kernel::SharedPtr<Kernel::Event> styleset_changed_event;
std::size_t dump_idx{};
Vibration last_processed_vibration{};
static constexpr std::array<u32, 10> npad_id_list{0, 1, 2, 3, 4, 5, 6, 7, 32, 16};
std::array<ControllerHolder, 10> connected_controllers{};
bool can_controllers_vibrate{true};