From a728d858b36af5466af1aa231819c453e7082860 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 16 Mar 2017 01:51:27 -0400 Subject: SI: Move MAX_SI_CHANNELS into the SerialInterface namespace Given this constant is related to the serial interface, it shouldn't be outside of the namespace. --- Source/Core/InputCommon/GCAdapter_Android.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/GCAdapter_Android.cpp') 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; -- cgit v1.2.3