diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-03-16 19:36:54 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 19:36:54 +1300 |
| commit | 2cead402b3186731c8e4de9d64af200f59010567 (patch) | |
| tree | 7e413ccc8602f69e29d60f06055cf3dd6d4ffdcc /Source/Core/InputCommon/GCAdapter.cpp | |
| parent | 3b1dae5642537b26e823f88cf73fea4c0a8c32e4 (diff) | |
| parent | 9c3b35fccb54440140c51eb19671fa23757dffd8 (diff) | |
Merge pull request #5091 from lioncash/enum
EXI/SI: Move enum constants into namespaces
Diffstat (limited to 'Source/Core/InputCommon/GCAdapter.cpp')
| -rw-r--r-- | Source/Core/InputCommon/GCAdapter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index 1baaceee12..8ee1a7aaa6 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -31,7 +31,7 @@ static void Setup(); static bool s_detected = false; static libusb_device_handle* s_handle = nullptr; -static u8 s_controller_type[MAX_SI_CHANNELS] = { +static u8 s_controller_type[SerialInterface::MAX_SI_CHANNELS] = { ControllerTypes::CONTROLLER_NONE, ControllerTypes::CONTROLLER_NONE, ControllerTypes::CONTROLLER_NONE, ControllerTypes::CONTROLLER_NONE}; static u8 s_controller_rumble[4]; @@ -199,7 +199,7 @@ static void Setup() libusb_device** list; ssize_t cnt = libusb_get_device_list(s_libusb_context.get(), &list); - for (int i = 0; i < MAX_SI_CHANNELS; i++) + for (int i = 0; i < SerialInterface::MAX_SI_CHANNELS; i++) { s_controller_type[i] = ControllerTypes::CONTROLLER_NONE; s_controller_rumble[i] = 0; @@ -350,7 +350,7 @@ static void Reset() s_adapter_thread.join(); } - for (int i = 0; i < MAX_SI_CHANNELS; i++) + for (int i = 0; i < SerialInterface::MAX_SI_CHANNELS; i++) s_controller_type[i] = ControllerTypes::CONTROLLER_NONE; s_detected = false; |
