summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-07-12 21:36:27 +0200
committerLioncash <mathew1800@gmail.com>2020-07-12 21:36:27 +0200
commit9ce6ea648f7cb51f5411d3e0753ef9a3439381c5 (patch)
tree9d689e6fb90cc578efc56fd9204910e100180e7f
parentMerge pull request #4221 from jbeich/unused-qt-opengl (diff)
downloadyuzu-9ce6ea648f7cb51f5411d3e0753ef9a3439381c5.tar
yuzu-9ce6ea648f7cb51f5411d3e0753ef9a3439381c5.tar.gz
yuzu-9ce6ea648f7cb51f5411d3e0753ef9a3439381c5.tar.bz2
yuzu-9ce6ea648f7cb51f5411d3e0753ef9a3439381c5.tar.lz
yuzu-9ce6ea648f7cb51f5411d3e0753ef9a3439381c5.tar.xz
yuzu-9ce6ea648f7cb51f5411d3e0753ef9a3439381c5.tar.zst
yuzu-9ce6ea648f7cb51f5411d3e0753ef9a3439381c5.zip
-rw-r--r--src/input_common/gcadapter/gc_adapter.cpp8
-rw-r--r--src/input_common/gcadapter/gc_adapter.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp
index 6d9f4d9eb..9fa170711 100644
--- a/src/input_common/gcadapter/gc_adapter.cpp
+++ b/src/input_common/gcadapter/gc_adapter.cpp
@@ -33,7 +33,7 @@ Adapter::Adapter() {
}
}
-GCPadStatus Adapter::GetPadStatus(int port, const std::array<u8, 37>& adapter_payload) {
+GCPadStatus Adapter::GetPadStatus(std::size_t port, const std::array<u8, 37>& adapter_payload) {
GCPadStatus pad = {};
bool get_origin = false;
@@ -227,7 +227,7 @@ void Adapter::Setup() {
}
if (devices != nullptr) {
- for (std::size_t index = 0; index < device_count; ++index) {
+ for (std::size_t index = 0; index < static_cast<std::size_t>(device_count); ++index) {
if (CheckDeviceAccess(devices[index])) {
// GC Adapter found and accessible, registering it
GetGCEndpoint(devices[index]);
@@ -357,11 +357,11 @@ void Adapter::Reset() {
}
}
-bool Adapter::DeviceConnected(int port) {
+bool Adapter::DeviceConnected(std::size_t port) {
return adapter_controllers_status[port] != ControllerTypes::None;
}
-void Adapter::ResetDeviceType(int port) {
+void Adapter::ResetDeviceType(std::size_t port) {
adapter_controllers_status[port] = ControllerTypes::None;
}
diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h
index b1c2a1958..250c2275a 100644
--- a/src/input_common/gcadapter/gc_adapter.h
+++ b/src/input_common/gcadapter/gc_adapter.h
@@ -104,7 +104,7 @@ public:
const std::array<GCState, 4>& GetPadState() const;
private:
- GCPadStatus GetPadStatus(int port, const std::array<u8, 37>& adapter_payload);
+ GCPadStatus GetPadStatus(std::size_t port, const std::array<u8, 37>& adapter_payload);
void PadToState(const GCPadStatus& pad, GCState& state);
@@ -117,10 +117,10 @@ private:
void StopScanThread();
/// Returns true if there is a device connected to port
- bool DeviceConnected(int port);
+ bool DeviceConnected(std::size_t port);
/// Resets status of device connected to port
- void ResetDeviceType(int port);
+ void ResetDeviceType(std::size_t port);
/// Returns true if we successfully gain access to GC Adapter
bool CheckDeviceAccess(libusb_device* device);