hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

gc_adapter: Silence sign conversion warnings

This commit is contained in:
Lioncash 2020-07-12 15:36:27 -04:00
parent 995067538d
commit 9ce6ea648f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/input_common/gcadapter/gc_adapter.cpp
View File

@ -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 = {}; GCPadStatus pad = {};
bool get_origin = false; bool get_origin = false;
@ -227,7 +227,7 @@ void Adapter::Setup() {
} }
if (devices != nullptr) { 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])) { if (CheckDeviceAccess(devices[index])) {
// GC Adapter found and accessible, registering it // GC Adapter found and accessible, registering it
GetGCEndpoint(devices[index]); 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; 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; adapter_controllers_status[port] = ControllerTypes::None;
} }

6
src/input_common/gcadapter/gc_adapter.h
View File

@ -104,7 +104,7 @@ public:
const std::array<GCState, 4>& GetPadState() const; const std::array<GCState, 4>& GetPadState() const;
private: 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); void PadToState(const GCPadStatus& pad, GCState& state);
@ -117,10 +117,10 @@ private:
void StopScanThread(); void StopScanThread();
/// Returns true if there is a device connected to port /// 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 /// 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 /// Returns true if we successfully gain access to GC Adapter
bool CheckDeviceAccess(libusb_device* device); bool CheckDeviceAccess(libusb_device* device);