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_Android.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_Android.cpp')
| -rw-r--r-- | Source/Core/InputCommon/GCAdapter_Android.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/GCAdapter_Android.cpp b/Source/Core/InputCommon/GCAdapter_Android.cpp index ab5c9db239..d8d40fb659 100644 --- a/Source/Core/InputCommon/GCAdapter_Android.cpp +++ b/Source/Core/InputCommon/GCAdapter_Android.cpp @@ -33,7 +33,7 @@ static jclass s_adapter_class; static bool s_detected = false; static int s_fd = 0; -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]; @@ -234,7 +234,7 @@ static void Reset() if (s_read_adapter_thread_running.TestAndClear()) s_read_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; |