GCAdapter: protect some more functions

Reset() and Setup() are not used outside of this namespace

4 files changed, 9 insertions, 8 deletions

diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp
index 4728a9f49f..adc0445697 100644
--- a/Source/Core/InputCommon/GCAdapter.cpp
+++ b/Source/Core/InputCommon/GCAdapter.cpp
@@ -23,6 +23,8 @@ namespace GCAdapter
 static bool CheckDeviceAccess(libusb_device* device);
 static void AddGCAdapter(libusb_device* device);
 static void ResetRumbleLockNeeded();
+static void Reset();
+static void Setup();
 
 static bool s_detected = false;
 static libusb_device_handle* s_handle = nullptr;
@@ -183,7 +185,7 @@ void StopScanThread()
 	}
 }
 
-void Setup()
+static void Setup()
 {
 	libusb_device** list;
 	ssize_t cnt = libusb_get_device_list(s_libusb_context, &list);
@@ -333,7 +335,7 @@ void Shutdown()
 	s_libusb_driver_not_supported = false;
 }
 
-void Reset()
+static void Reset()
 {
 	std::unique_lock<std::mutex> lock(s_init_mutex, std::defer_lock);
 	if (!lock.try_lock())
diff --git a/Source/Core/InputCommon/GCAdapter.h b/Source/Core/InputCommon/GCAdapter.h
index a1780cdf1e..5568b0ae9d 100644
--- a/Source/Core/InputCommon/GCAdapter.h
+++ b/Source/Core/InputCommon/GCAdapter.h
@@ -19,9 +19,7 @@ enum ControllerTypes
 	CONTROLLER_WIRELESS = 2
 };
 void Init();
-void Reset();
 void ResetRumble();
-void Setup();
 void Shutdown();
 void SetAdapterCallback(std::function<void(void)> func);
 void StartScanThread();
diff --git a/Source/Core/InputCommon/GCAdapter_Android.cpp b/Source/Core/InputCommon/GCAdapter_Android.cpp
index 46ec417f2b..b05a066478 100644
--- a/Source/Core/InputCommon/GCAdapter_Android.cpp
+++ b/Source/Core/InputCommon/GCAdapter_Android.cpp
@@ -24,6 +24,9 @@ extern JavaVM* g_java_vm;
 
 namespace GCAdapter
 {
+static void Setup();
+static void Reset();
+
 // Java classes
 static jclass s_adapter_class;
 
@@ -207,7 +210,7 @@ void Init()
 		StartScanThread();
 }
 
-void Setup()
+static void Setup()
 {
 	s_fd = 0;
 	s_detected = true;
@@ -220,7 +223,7 @@ void Setup()
 	s_read_adapter_thread = std::thread(Read);
 }
 
-void Reset()
+static void Reset()
 {
 	if (!s_detected)
 		return;
diff --git a/Source/Core/InputCommon/GCAdapter_Null.cpp b/Source/Core/InputCommon/GCAdapter_Null.cpp
index b7bc81dfa7..d7f13c2917 100644
--- a/Source/Core/InputCommon/GCAdapter_Null.cpp
+++ b/Source/Core/InputCommon/GCAdapter_Null.cpp
@@ -9,9 +9,7 @@ namespace GCAdapter
 {
 
 void Init() {}
-void Reset() {}
 void ResetRumble() {}
-void Setup() {}
 void Shutdown() {}
 void SetAdapterCallback(std::function<void(void)> func) {}
 void StartScanThread() {}