summaryrefslogtreecommitdiff
path: root/src/input_common/gcadapter/gc_adapter.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/input_common/gcadapter/gc_adapter.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp
index 0fc609184..02d06876f 100644
--- a/src/input_common/gcadapter/gc_adapter.cpp
+++ b/src/input_common/gcadapter/gc_adapter.cpp
@@ -34,7 +34,7 @@ Adapter::Adapter() {
34 34
35GCPadStatus Adapter::GetPadStatus(std::size_t port, const std::array<u8, 37>& adapter_payload) { 35GCPadStatus Adapter::GetPadStatus(std::size_t port, const std::array<u8, 37>& adapter_payload) {
36 GCPadStatus pad = {}; 36 GCPadStatus pad = {};
37 const size_t offset = 1 + (9 * port); 37 const std::size_t offset = 1 + (9 * port);
38 38
39 adapter_controllers_status[port] = static_cast<ControllerTypes>(adapter_payload[offset] >> 4); 39 adapter_controllers_status[port] = static_cast<ControllerTypes>(adapter_payload[offset] >> 4);
40 40
@@ -77,7 +77,7 @@ GCPadStatus Adapter::GetPadStatus(std::size_t port, const std::array<u8, 37>& ad
77 } 77 }
78 } 78 }
79 for (PadAxes axis : axes) { 79 for (PadAxes axis : axes) {
80 const int index = static_cast<int>(axis); 80 const std::size_t index = static_cast<std::size_t>(axis);
81 pad.axis_values[index] = adapter_payload[offset + 3 + index]; 81 pad.axis_values[index] = adapter_payload[offset + 3 + index];
82 } 82 }
83 83
@@ -112,7 +112,8 @@ void Adapter::Read() {
112 sizeof(adapter_payload), &payload_size, 16); 112 sizeof(adapter_payload), &payload_size, 16);
113 113
114 if (payload_size != sizeof(adapter_payload) || adapter_payload[0] != LIBUSB_DT_HID) { 114 if (payload_size != sizeof(adapter_payload) || adapter_payload[0] != LIBUSB_DT_HID) {
115 LOG_ERROR(Input, "error reading payload (size: {}, type: {:02x}) Possible disconnect?", 115 LOG_ERROR(Input,
116 "Error reading payload (size: {}, type: {:02x}) Is the adapter connected?",
116 payload_size, adapter_payload[0]); 117 payload_size, adapter_payload[0]);
117 adapter_thread_running = false; // error reading from adapter, stop reading. 118 adapter_thread_running = false; // error reading from adapter, stop reading.
118 break; 119 break;