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.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/InputCommon/GCAdapter.cpp') 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; -- cgit v1.2.3