diff --git a/Source/Core/Core/IOS/Network/IP/Top.cpp b/Source/Core/Core/IOS/Network/IP/Top.cpp index 14d90a04e1..8baa81aef7 100644 --- a/Source/Core/Core/IOS/Network/IP/Top.cpp +++ b/Source/Core/Core/IOS/Network/IP/Top.cpp @@ -786,8 +786,8 @@ IPCReply NetIPTopDevice::HandleGetPeerNameRequest(const IOCtlRequest& request) IPCReply NetIPTopDevice::HandleGetHostIDRequest(const IOCtlRequest& request) { - const DefaultInterface interface = GetSystemDefaultInterfaceOrFallback(); - const u32 host_ip = ntohl(interface.inet.s_addr); + const DefaultInterface net_interface = GetSystemDefaultInterfaceOrFallback(); + const u32 host_ip = ntohl(net_interface.inet.s_addr); INFO_LOG_FMT(IOS_NET, "IOCTL_SO_GETHOSTID = {}.{}.{}.{}", host_ip >> 24, (host_ip >> 16) & 0xFF, (host_ip >> 8) & 0xFF, host_ip & 0xFF); return IPCReply(host_ip); @@ -1159,10 +1159,10 @@ IPCReply NetIPTopDevice::HandleGetInterfaceOptRequest(const IOCtlVRequest& reque // XXX: this isn't exactly right; the buffer can be larger than 12 bytes, // in which case, depending on some interface settings, SO can write 12 more bytes memory.Write_U32(0xC, request.io_vectors[1].address); - const DefaultInterface interface = GetSystemDefaultInterfaceOrFallback(); - memory.Write_U32(ntohl(interface.inet.s_addr), request.io_vectors[0].address); - memory.Write_U32(ntohl(interface.netmask.s_addr), request.io_vectors[0].address + 4); - memory.Write_U32(ntohl(interface.broadcast.s_addr), request.io_vectors[0].address + 8); + const DefaultInterface net_interface = GetSystemDefaultInterfaceOrFallback(); + memory.Write_U32(ntohl(net_interface.inet.s_addr), request.io_vectors[0].address); + memory.Write_U32(ntohl(net_interface.netmask.s_addr), request.io_vectors[0].address + 4); + memory.Write_U32(ntohl(net_interface.broadcast.s_addr), request.io_vectors[0].address + 8); break; } @@ -1174,8 +1174,8 @@ IPCReply NetIPTopDevice::HandleGetInterfaceOptRequest(const IOCtlVRequest& reque case 0x4006: // get routing table { - const DefaultInterface interface = GetSystemDefaultInterfaceOrFallback(); - for (InterfaceRouting route : interface.routing_table) + const DefaultInterface net_interface = GetSystemDefaultInterfaceOrFallback(); + for (InterfaceRouting route : net_interface.routing_table) { memory.Write_U32(ntohl(route.destination.s_addr), request.io_vectors[0].address + param5); memory.Write_U32(ntohl(route.netmask.s_addr), request.io_vectors[0].address + param5 + 4); diff --git a/Source/Core/Core/IOS/USB/Common.h b/Source/Core/Core/IOS/USB/Common.h index cdc7c39dad..ae9d753c74 100644 --- a/Source/Core/Core/IOS/USB/Common.h +++ b/Source/Core/Core/IOS/USB/Common.h @@ -170,7 +170,7 @@ public: virtual DeviceDescriptor GetDeviceDescriptor() const = 0; virtual std::vector GetConfigurations() const = 0; virtual std::vector GetInterfaces(u8 config) const = 0; - virtual std::vector GetEndpoints(u8 config, u8 interface, u8 alt) const = 0; + virtual std::vector GetEndpoints(u8 config, u8 iface, u8 alt) const = 0; virtual std::string GetErrorName(int error_code) const; /// Ensure the device is ready to use. @@ -179,10 +179,10 @@ public: /// /// This may reset the active alt setting, so prefer using Attach when interface changes /// are unnecessary (e.g. for control requests). - virtual bool AttachAndChangeInterface(u8 interface) = 0; + virtual bool AttachAndChangeInterface(u8 iface) = 0; virtual int CancelTransfer(u8 endpoint) = 0; - virtual int ChangeInterface(u8 interface) = 0; - virtual int GetNumberOfAltSettings(u8 interface) = 0; + virtual int ChangeInterface(u8 iface) = 0; + virtual int GetNumberOfAltSettings(u8 iface) = 0; virtual int SetAltSetting(u8 alt_setting) = 0; virtual int SubmitTransfer(std::unique_ptr message) = 0; virtual int SubmitTransfer(std::unique_ptr message) = 0; diff --git a/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp b/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp index fcfa203742..4586386404 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp @@ -168,7 +168,7 @@ std::vector InfinityUSB::GetInterfaces(u8 config) const return m_interface_descriptor; } -std::vector InfinityUSB::GetEndpoints(u8 config, u8 interface, u8 alt) const +std::vector InfinityUSB::GetEndpoints(u8 config, u8 iface, u8 alt) const { return m_endpoint_descriptor; } @@ -184,13 +184,13 @@ bool InfinityUSB::Attach() return true; } -bool InfinityUSB::AttachAndChangeInterface(const u8 interface) +bool InfinityUSB::AttachAndChangeInterface(const u8 iface) { if (!Attach()) return false; - if (interface != m_active_interface) - return ChangeInterface(interface) == 0; + if (iface != m_active_interface) + return ChangeInterface(iface) == 0; return true; } @@ -203,15 +203,15 @@ int InfinityUSB::CancelTransfer(const u8 endpoint) return IPC_SUCCESS; } -int InfinityUSB::ChangeInterface(const u8 interface) +int InfinityUSB::ChangeInterface(const u8 iface) { DEBUG_LOG_FMT(IOS_USB, "[{:04x}:{:04x} {}] Changing interface to {}", m_vid, m_pid, - m_active_interface, interface); - m_active_interface = interface; + m_active_interface, iface); + m_active_interface = iface; return 0; } -int InfinityUSB::GetNumberOfAltSettings(u8 interface) +int InfinityUSB::GetNumberOfAltSettings(u8 iface) { return 0; } diff --git a/Source/Core/Core/IOS/USB/Emulated/Infinity.h b/Source/Core/Core/IOS/USB/Emulated/Infinity.h index 8bafefd64b..ebf9dd7894 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Infinity.h +++ b/Source/Core/Core/IOS/USB/Emulated/Infinity.h @@ -37,12 +37,12 @@ public: DeviceDescriptor GetDeviceDescriptor() const override; std::vector GetConfigurations() const override; std::vector GetInterfaces(u8 config) const override; - std::vector GetEndpoints(u8 config, u8 interface, u8 alt) const override; + std::vector GetEndpoints(u8 config, u8 iface, u8 alt) const override; bool Attach() override; - bool AttachAndChangeInterface(u8 interface) override; + bool AttachAndChangeInterface(u8 iface) override; int CancelTransfer(u8 endpoint) override; - int ChangeInterface(u8 interface) override; - int GetNumberOfAltSettings(u8 interface) override; + int ChangeInterface(u8 iface) override; + int GetNumberOfAltSettings(u8 iface) override; int SetAltSetting(u8 alt_setting) override; int SubmitTransfer(std::unique_ptr message) override; int SubmitTransfer(std::unique_ptr message) override; diff --git a/Source/Core/Core/IOS/USB/Emulated/LogitechMic.cpp b/Source/Core/Core/IOS/USB/Emulated/LogitechMic.cpp index 8380c533dc..df16180345 100644 --- a/Source/Core/Core/IOS/USB/Emulated/LogitechMic.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/LogitechMic.cpp @@ -161,13 +161,13 @@ bool LogitechMic::Attach() return true; } -bool LogitechMic::AttachAndChangeInterface(const u8 interface) +bool LogitechMic::AttachAndChangeInterface(const u8 iface) { if (!Attach()) return false; - if (interface != m_active_interface) - return ChangeInterface(interface) == 0; + if (iface != m_active_interface) + return ChangeInterface(iface) == 0; return true; } @@ -180,17 +180,17 @@ int LogitechMic::CancelTransfer(const u8 endpoint) return IPC_SUCCESS; } -int LogitechMic::ChangeInterface(const u8 interface) +int LogitechMic::ChangeInterface(const u8 iface) { DEBUG_LOG_FMT(IOS_USB, "[{:04x}:{:04x} {}:{}] Changing interface to {}", m_vid, m_pid, m_index, - m_active_interface, interface); - m_active_interface = interface; + m_active_interface, iface); + m_active_interface = iface; return 0; } -int LogitechMic::GetNumberOfAltSettings(u8 interface) +int LogitechMic::GetNumberOfAltSettings(u8 iface) { - if (interface == 1) + if (iface == 1) return 2; return 0; diff --git a/Source/Core/Core/IOS/USB/Emulated/LogitechMic.h b/Source/Core/Core/IOS/USB/Emulated/LogitechMic.h index 3ae5810344..a8319604f4 100644 --- a/Source/Core/Core/IOS/USB/Emulated/LogitechMic.h +++ b/Source/Core/Core/IOS/USB/Emulated/LogitechMic.h @@ -37,12 +37,12 @@ public: DeviceDescriptor GetDeviceDescriptor() const override; std::vector GetConfigurations() const override; std::vector GetInterfaces(u8 config) const override; - std::vector GetEndpoints(u8 config, u8 interface, u8 alt) const override; + std::vector GetEndpoints(u8 config, u8 iface, u8 alt) const override; bool Attach() override; - bool AttachAndChangeInterface(u8 interface) override; + bool AttachAndChangeInterface(u8 iface) override; int CancelTransfer(u8 endpoint) override; - int ChangeInterface(u8 interface) override; - int GetNumberOfAltSettings(u8 interface) override; + int ChangeInterface(u8 iface) override; + int GetNumberOfAltSettings(u8 iface) override; int SetAltSetting(u8 alt_setting) override; int SubmitTransfer(std::unique_ptr cmd) override; int SubmitTransfer(std::unique_ptr cmd) override; diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp index 02b16194d5..1b07002c7b 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp @@ -644,7 +644,7 @@ std::vector SkylanderUSB::GetInterfaces(u8 config) const return m_interface_descriptor; } -std::vector SkylanderUSB::GetEndpoints(u8 config, u8 interface, u8 alt) const +std::vector SkylanderUSB::GetEndpoints(u8 config, u8 iface, u8 alt) const { return m_endpoint_descriptor; } @@ -660,13 +660,13 @@ bool SkylanderUSB::Attach() return true; } -bool SkylanderUSB::AttachAndChangeInterface(const u8 interface) +bool SkylanderUSB::AttachAndChangeInterface(const u8 iface) { if (!Attach()) return false; - if (interface != m_active_interface) - return ChangeInterface(interface) == 0; + if (iface != m_active_interface) + return ChangeInterface(iface) == 0; return true; } @@ -679,15 +679,15 @@ int SkylanderUSB::CancelTransfer(const u8 endpoint) return IPC_SUCCESS; } -int SkylanderUSB::ChangeInterface(const u8 interface) +int SkylanderUSB::ChangeInterface(const u8 iface) { DEBUG_LOG_FMT(IOS_USB, "[{:04x}:{:04x} {}] Changing interface to {}", m_vid, m_pid, - m_active_interface, interface); - m_active_interface = interface; + m_active_interface, iface); + m_active_interface = iface; return 0; } -int SkylanderUSB::GetNumberOfAltSettings(u8 interface) +int SkylanderUSB::GetNumberOfAltSettings(u8 iface) { return 0; } diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h index f9f8f8f616..9de058f59f 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h +++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h @@ -77,12 +77,12 @@ public: DeviceDescriptor GetDeviceDescriptor() const override; std::vector GetConfigurations() const override; std::vector GetInterfaces(u8 config) const override; - std::vector GetEndpoints(u8 config, u8 interface, u8 alt) const override; + std::vector GetEndpoints(u8 config, u8 iface, u8 alt) const override; bool Attach() override; - bool AttachAndChangeInterface(u8 interface) override; + bool AttachAndChangeInterface(u8 iface) override; int CancelTransfer(u8 endpoint) override; - int ChangeInterface(u8 interface) override; - int GetNumberOfAltSettings(u8 interface) override; + int ChangeInterface(u8 iface) override; + int GetNumberOfAltSettings(u8 iface) override; int SetAltSetting(u8 alt_setting) override; int SubmitTransfer(std::unique_ptr message) override; int SubmitTransfer(std::unique_ptr message) override; diff --git a/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.cpp b/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.cpp index eaaadacc94..3b519c4c6e 100644 --- a/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.cpp @@ -77,7 +77,7 @@ std::vector WiiSpeak::GetInterfaces(u8 config) const return m_interface_descriptor; } -std::vector WiiSpeak::GetEndpoints(u8 config, u8 interface, u8 alt) const +std::vector WiiSpeak::GetEndpoints(u8 config, u8 iface, u8 alt) const { return m_endpoint_descriptor; } @@ -97,13 +97,13 @@ bool WiiSpeak::Attach() return true; } -bool WiiSpeak::AttachAndChangeInterface(const u8 interface) +bool WiiSpeak::AttachAndChangeInterface(const u8 iface) { if (!Attach()) return false; - if (interface != m_active_interface) - return ChangeInterface(interface) == 0; + if (iface != m_active_interface) + return ChangeInterface(iface) == 0; return true; } @@ -116,15 +116,15 @@ int WiiSpeak::CancelTransfer(const u8 endpoint) return IPC_SUCCESS; } -int WiiSpeak::ChangeInterface(const u8 interface) +int WiiSpeak::ChangeInterface(const u8 iface) { DEBUG_LOG_FMT(IOS_USB, "[{:04x}:{:04x} {}] Changing interface to {}", m_vid, m_pid, - m_active_interface, interface); - m_active_interface = interface; + m_active_interface, iface); + m_active_interface = iface; return 0; } -int WiiSpeak::GetNumberOfAltSettings(u8 interface) +int WiiSpeak::GetNumberOfAltSettings(u8 iface) { return 0; } diff --git a/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.h b/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.h index 9a0ae13674..ef48883d29 100644 --- a/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.h +++ b/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.h @@ -40,12 +40,12 @@ public: DeviceDescriptor GetDeviceDescriptor() const override; std::vector GetConfigurations() const override; std::vector GetInterfaces(u8 config) const override; - std::vector GetEndpoints(u8 config, u8 interface, u8 alt) const override; + std::vector GetEndpoints(u8 config, u8 iface, u8 alt) const override; bool Attach() override; - bool AttachAndChangeInterface(u8 interface) override; + bool AttachAndChangeInterface(u8 f) override; int CancelTransfer(u8 endpoint) override; - int ChangeInterface(u8 interface) override; - int GetNumberOfAltSettings(u8 interface) override; + int ChangeInterface(u8 iface) override; + int GetNumberOfAltSettings(u8 iface) override; int SetAltSetting(u8 alt_setting) override; int SubmitTransfer(std::unique_ptr message) override; int SubmitTransfer(std::unique_ptr message) override; diff --git a/Source/Core/Core/IOS/USB/LibusbDevice.cpp b/Source/Core/Core/IOS/USB/LibusbDevice.cpp index da127b70d5..adc2351555 100644 --- a/Source/Core/Core/IOS/USB/LibusbDevice.cpp +++ b/Source/Core/Core/IOS/USB/LibusbDevice.cpp @@ -163,13 +163,13 @@ bool LibusbDevice::Attach() return true; } -bool LibusbDevice::AttachAndChangeInterface(const u8 interface) +bool LibusbDevice::AttachAndChangeInterface(const u8 iface) { if (!Attach()) return false; - if (interface != m_active_interface) - return ChangeInterface(interface) == LIBUSB_SUCCESS; + if (iface != m_active_interface) + return ChangeInterface(iface) == LIBUSB_SUCCESS; return true; } @@ -185,11 +185,11 @@ int LibusbDevice::CancelTransfer(const u8 endpoint) return IPC_SUCCESS; } -int LibusbDevice::ChangeInterface(const u8 interface) +int LibusbDevice::ChangeInterface(const u8 iface) { INFO_LOG_FMT(IOS_USB, "[{:04x}:{:04x} {}] Changing interface to {}", m_vid, m_pid, - m_active_interface, interface); - m_active_interface = interface; + m_active_interface, iface); + m_active_interface = iface; return LIBUSB_SUCCESS; } diff --git a/Source/Core/Core/IOS/USB/LibusbDevice.h b/Source/Core/Core/IOS/USB/LibusbDevice.h index e6151b11e2..1e0207b9de 100644 --- a/Source/Core/Core/IOS/USB/LibusbDevice.h +++ b/Source/Core/Core/IOS/USB/LibusbDevice.h @@ -31,13 +31,13 @@ public: DeviceDescriptor GetDeviceDescriptor() const override; std::vector GetConfigurations() const override; std::vector GetInterfaces(u8 config) const override; - std::vector GetEndpoints(u8 config, u8 interface, u8 alt) const override; + std::vector GetEndpoints(u8 config, u8 iface, u8 alt) const override; std::string GetErrorName(int error_code) const override; bool Attach() override; - bool AttachAndChangeInterface(u8 interface) override; + bool AttachAndChangeInterface(u8 iface) override; int CancelTransfer(u8 endpoint) override; - int ChangeInterface(u8 interface) override; - int GetNumberOfAltSettings(u8 interface) override; + int ChangeInterface(u8 iface) override; + int GetNumberOfAltSettings(u8 iface) override; int SetAltSetting(u8 alt_setting) override; int SubmitTransfer(std::unique_ptr message) override; int SubmitTransfer(std::unique_ptr message) override;