The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-10 11:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13371 from Florin9doi/prusb1

Browse Source 
USB: Remove unused parameters
This commit is contained in:
Tilka 2025-02-24 05:20:30 +00:00 committed by GitHub
commit 4d1737e423
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/IOS/USB/Emulated/Infinity.cpp
View File

@ -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, static constexpr std::array<u8, 16> BLANK_BLOCK = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
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_vid = 0x0E6F;
m_pid = 0x0129; m_pid = 0x0129;

2
Source/Core/Core/IOS/USB/Emulated/Infinity.h
View File

@ -32,7 +32,7 @@ struct InfinityFigure final
class InfinityUSB final : public Device class InfinityUSB final : public Device
{ {
public: public:
InfinityUSB(EmulationKernel& ios, const std::string& device_name); InfinityUSB(EmulationKernel& ios);
~InfinityUSB() override; ~InfinityUSB() override;
DeviceDescriptor GetDeviceDescriptor() const override; DeviceDescriptor GetDeviceDescriptor() const override;
std::vector<ConfigDescriptor> GetConfigurations() const override; std::vector<ConfigDescriptor> GetConfigurations() const override;

4
Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp
View File

@ -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}}, {{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_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 | m_id = (static_cast<u64>(m_vid) << 32 | static_cast<u64>(m_pid) << 16 | static_cast<u64>(9) << 8 |
static_cast<u64>(1)); static_cast<u64>(1));
m_device_descriptor = DeviceDescriptor{0x12, 0x1, 0x200, 0x0, 0x0, 0x0, 0x40, m_device_descriptor = DeviceDescriptor{0x12, 0x1, 0x200, 0x0, 0x0, 0x0, 0x40,

2
Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h
View File

@ -72,7 +72,7 @@ extern const std::map<const std::pair<const u16, const u16>, SkyData> list_skyla
class SkylanderUSB final : public Device class SkylanderUSB final : public Device
{ {
public: public:
SkylanderUSB(EmulationKernel& ios, const std::string& device_name); SkylanderUSB(EmulationKernel& ios);
~SkylanderUSB(); ~SkylanderUSB();
DeviceDescriptor GetDeviceDescriptor() const override; DeviceDescriptor GetDeviceDescriptor() const override;
std::vector<ConfigDescriptor> GetConfigurations() const override; std::vector<ConfigDescriptor> GetConfigurations() const override;

5
Source/Core/Core/IOS/USB/Host.cpp
View File

@ -187,13 +187,12 @@ void USBHost::AddEmulatedDevices(std::set<u64>& new_devices, DeviceChangeHooks&
{ {
if (Config::Get(Config::MAIN_EMULATE_SKYLANDER_PORTAL) && !NetPlay::IsNetPlayRunning()) if (Config::Get(Config::MAIN_EMULATE_SKYLANDER_PORTAL) && !NetPlay::IsNetPlayRunning())
{ {
auto skylanderportal = auto skylanderportal = std::make_unique<USB::SkylanderUSB>(GetEmulationKernel());
std::make_unique<USB::SkylanderUSB>(GetEmulationKernel(), "Skylander Portal");
CheckAndAddDevice(std::move(skylanderportal), new_devices, hooks, always_add_hooks); CheckAndAddDevice(std::move(skylanderportal), new_devices, hooks, always_add_hooks);
} }
if (Config::Get(Config::MAIN_EMULATE_INFINITY_BASE) && !NetPlay::IsNetPlayRunning()) 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); CheckAndAddDevice(std::move(infinity_base), new_devices, hooks, always_add_hooks);
} }
} }