diff options
| author | Florin9doi <Florin9doi@users.noreply.github.com> | 2025-01-07 18:48:29 +0200 |
|---|---|---|
| committer | Florin9doi <Florin9doi@users.noreply.github.com> | 2025-02-24 00:07:28 +0200 |
| commit | 51dc3ff466db74435ac8b43c587123cf324314b1 (patch) | |
| tree | d665c580dec88b0be692231b0ea21518e448c7a8 | |
| parent | 6d9c887a214f4fec16779f9ecbec555948ef94cd (diff) | |
USB: Remove unused params
5 files changed, 7 insertions, 8 deletions
diff --git a/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp b/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp index 34a2f40698..666fe56b85 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp @@ -137,7 +137,7 @@ static constexpr std::array<u8, 32> SHA1_CONSTANT = { static constexpr std::array<u8, 16> BLANK_BLOCK = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -InfinityUSB::InfinityUSB(EmulationKernel& ios, const std::string& device_name) : m_ios(ios) +InfinityUSB::InfinityUSB(EmulationKernel& ios) : m_ios(ios) { m_vid = 0x0E6F; m_pid = 0x0129; diff --git a/Source/Core/Core/IOS/USB/Emulated/Infinity.h b/Source/Core/Core/IOS/USB/Emulated/Infinity.h index a90a248b65..532db45fbb 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Infinity.h +++ b/Source/Core/Core/IOS/USB/Emulated/Infinity.h @@ -32,7 +32,7 @@ struct InfinityFigure final class InfinityUSB final : public Device { public: - InfinityUSB(EmulationKernel& ios, const std::string& device_name); + InfinityUSB(EmulationKernel& ios); ~InfinityUSB() override; DeviceDescriptor GetDeviceDescriptor() const override; std::vector<ConfigDescriptor> GetConfigurations() const override; diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp index a43efb442d..b526965d9b 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp +++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp @@ -612,10 +612,10 @@ const std::map<const std::pair<const u16, const u16>, SkyData> list_skylanders = {{3503, 0x4000}, {"Kaos Trophy", Game::Superchargers, Element::Other, Type::Trophy}}, }; -SkylanderUSB::SkylanderUSB(EmulationKernel& ios, const std::string& device_name) : m_ios(ios) +SkylanderUSB::SkylanderUSB(EmulationKernel& ios) : m_ios(ios) { m_vid = 0x1430; - m_pid = 0x150; + m_pid = 0x0150; m_id = (static_cast<u64>(m_vid) << 32 | static_cast<u64>(m_pid) << 16 | static_cast<u64>(9) << 8 | static_cast<u64>(1)); m_device_descriptor = DeviceDescriptor{0x12, 0x1, 0x200, 0x0, 0x0, 0x0, 0x40, diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h index 4f96c3d91c..7d3da99209 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h +++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h @@ -72,7 +72,7 @@ extern const std::map<const std::pair<const u16, const u16>, SkyData> list_skyla class SkylanderUSB final : public Device { public: - SkylanderUSB(EmulationKernel& ios, const std::string& device_name); + SkylanderUSB(EmulationKernel& ios); ~SkylanderUSB(); DeviceDescriptor GetDeviceDescriptor() const override; std::vector<ConfigDescriptor> GetConfigurations() const override; diff --git a/Source/Core/Core/IOS/USB/Host.cpp b/Source/Core/Core/IOS/USB/Host.cpp index bc1eace025..c8d55a0bf5 100644 --- a/Source/Core/Core/IOS/USB/Host.cpp +++ b/Source/Core/Core/IOS/USB/Host.cpp @@ -187,13 +187,12 @@ void USBHost::AddEmulatedDevices(std::set<u64>& new_devices, DeviceChangeHooks& { if (Config::Get(Config::MAIN_EMULATE_SKYLANDER_PORTAL) && !NetPlay::IsNetPlayRunning()) { - auto skylanderportal = - std::make_unique<USB::SkylanderUSB>(GetEmulationKernel(), "Skylander Portal"); + auto skylanderportal = std::make_unique<USB::SkylanderUSB>(GetEmulationKernel()); CheckAndAddDevice(std::move(skylanderportal), new_devices, hooks, always_add_hooks); } if (Config::Get(Config::MAIN_EMULATE_INFINITY_BASE) && !NetPlay::IsNetPlayRunning()) { - auto infinity_base = std::make_unique<USB::InfinityUSB>(GetEmulationKernel(), "Infinity Base"); + auto infinity_base = std::make_unique<USB::InfinityUSB>(GetEmulationKernel()); CheckAndAddDevice(std::move(infinity_base), new_devices, hooks, always_add_hooks); } } |
