1 files changed, 6 insertions, 38 deletions

diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h
index 3586c8bda..bed81915c 100644
--- a/src/input_common/gcadapter/gc_adapter.h
+++ b/src/input_common/gcadapter/gc_adapter.h
@@ -47,24 +47,10 @@ enum class PadAxes : u8 {
 };
 
 struct GCPadStatus {
-    u16 button{};       // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits
-    u8 stick_x{};       // 0 <= stick_x       <= 255
-    u8 stick_y{};       // 0 <= stick_y       <= 255
-    u8 substick_x{};    // 0 <= substick_x    <= 255
-    u8 substick_y{};    // 0 <= substick_y    <= 255
-    u8 trigger_left{};  // 0 <= trigger_left  <= 255
-    u8 trigger_right{}; // 0 <= trigger_right <= 255
-
-    static constexpr u8 MAIN_STICK_CENTER_X = 0x80;
-    static constexpr u8 MAIN_STICK_CENTER_Y = 0x80;
-    static constexpr u8 MAIN_STICK_RADIUS = 0x7f;
-    static constexpr u8 C_STICK_CENTER_X = 0x80;
-    static constexpr u8 C_STICK_CENTER_Y = 0x80;
-    static constexpr u8 C_STICK_RADIUS = 0x7f;
-    static constexpr u8 THRESHOLD = 10;
-
-    // 256/4, at least a quarter press to count as a press. For polling mostly
-    static constexpr u8 TRIGGER_THRESHOLD = 64;
+    u16 button{}; // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits
+
+    std::array<u8, 6> axis_values{};    // Triggers and sticks, following indices defined in PadAxes
+    static constexpr u8 THRESHOLD = 50; // Threshold for axis press for polling
 
     u8 port{};
     PadAxes axis{PadAxes::Undefined};
@@ -78,11 +64,6 @@ struct GCState {
 
 enum class ControllerTypes { None, Wired, Wireless };
 
-enum {
-    NO_ADAPTER_DETECTED = 0,
-    ADAPTER_DETECTED = 1,
-};
-
 class Adapter {
 public:
     /// Initialize the GC Adapter capture and read sequence
@@ -111,12 +92,6 @@ private:
     void PadToState(const GCPadStatus& pad, GCState& state);
 
     void Read();
-    void ScanThreadFunc();
-    /// Begin scanning for the GC Adapter.
-    void StartScanThread();
-
-    /// Stop scanning for the adapter
-    void StopScanThread();
 
     /// Resets status of device connected to port
     void ResetDeviceType(std::size_t port);
@@ -133,19 +108,11 @@ private:
     /// For use in initialization, querying devices to find the adapter
     void Setup();
 
-    int current_status = NO_ADAPTER_DETECTED;
     libusb_device_handle* usb_adapter_handle = nullptr;
-    std::array<ControllerTypes, 4> adapter_controllers_status{};
-
-    std::mutex s_mutex;
 
     std::thread adapter_input_thread;
     bool adapter_thread_running;
 
-    std::mutex initialization_mutex;
-    std::thread detect_thread;
-    bool detect_thread_running = false;
-
     libusb_context* libusb_ctx;
 
     u8 input_endpoint = 0;
@@ -153,10 +120,11 @@ private:
 
     bool configuring = false;
 
-    std::array<Common::SPSCQueue<GCPadStatus>, 4> pad_queue;
     std::array<GCState, 4> state;
     std::array<bool, 4> get_origin;
     std::array<GCPadStatus, 4> origin_status;
+    std::array<Common::SPSCQueue<GCPadStatus>, 4> pad_queue;
+    std::array<ControllerTypes, 4> adapter_controllers_status{};
 };
 
 } // namespace GCAdapter