piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use range loop (if possible)

Browse Source
This commit is contained in:
Filip Gawin
2019-02-01 19:47:07 +01:00
committed by Jordan Woyak
parent 0fa4812c2f
commit 0ede5d1537
15 changed files with 92 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/InputCommon/GCAdapter.cpp
View File

@ -40,10 +40,10 @@ enum
// Current adapter status: detected/not detected/in error (holds the error code)
static std::atomic<int> s_status = NO_ADAPTER_DETECTED;
static libusb_device_handle* s_handle = nullptr;
static u8 s_controller_type[SerialInterface::MAX_SI_CHANNELS] = {
static std::array<u8, SerialInterface::MAX_SI_CHANNELS> s_controller_type = {
ControllerTypes::CONTROLLER_NONE, ControllerTypes::CONTROLLER_NONE,
ControllerTypes::CONTROLLER_NONE, ControllerTypes::CONTROLLER_NONE};
static u8 s_controller_rumble[4];
static std::array<u8, SerialInterface::MAX_SI_CHANNELS> s_controller_rumble{};
static std::mutex s_mutex;
static u8 s_controller_payload[37];
@ -236,11 +236,8 @@ static void Setup()
if (s_status < 0)
s_status = NO_ADAPTER_DETECTED;
for (int i = 0; i < SerialInterface::MAX_SI_CHANNELS; i++)
{
s_controller_type[i] = ControllerTypes::CONTROLLER_NONE;
s_controller_rumble[i] = 0;
}
s_controller_type.fill(ControllerTypes::CONTROLLER_NONE);
s_controller_rumble.fill(0);
s_libusb_context.GetDeviceList([](libusb_device* device) {
if (CheckDeviceAccess(device))
@ -395,8 +392,7 @@ static void Reset()
s_adapter_output_thread.join();
}
for (int i = 0; i < SerialInterface::MAX_SI_CHANNELS; i++)
s_controller_type[i] = ControllerTypes::CONTROLLER_NONE;
s_controller_type.fill(ControllerTypes::CONTROLLER_NONE);
s_status = NO_ADAPTER_DETECTED;