archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

IOS/USB: deduplicate scan thread stopping

Browse source 
Unlike other functions, base ctors/dtors are always called automatically.
This commit is contained in:
Tillmann Karras 2020-08-02 23:47:42 +01:00
parent 1f4b9adbf5
commit ee0d4661ab
8 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,10 @@ USBHost::USBHost(Kernel& ios, const std::string& device_name) : Device(ios, devi
{
}
USBHost::~USBHost() = default;
USBHost::~USBHost()
{
StopThreads();
}
IPCCommandResult USBHost::Open(const OpenRequest& request)
{

5
Source/Core/Core/IOS/USB/Host.h
View file

@ -53,13 +53,14 @@ protected:
virtual void OnDeviceChange(ChangeEvent event, std::shared_ptr<USB::Device> changed_device);
virtual void OnDeviceChangeEnd();
virtual bool ShouldAddDevice(const USB::Device& device) const;
void StartThreads();
void StopThreads();
IPCCommandResult HandleTransfer(std::shared_ptr<USB::Device> device, u32 request,
std::function<s32()> submit) const;
private:
void StartThreads();
void StopThreads();
bool AddDevice(std::unique_ptr<USB::Device> device);
bool UpdateDevices(bool always_add_hooks = false);

5
Source/Core/Core/IOS/USB/OH0/OH0.cpp
View file

@ -26,11 +26,6 @@ OH0::OH0(Kernel& ios, const std::string& device_name) : USBHost(ios, device_name
{
}
OH0::~OH0()
{
StopThreads();
}
IPCCommandResult OH0::Open(const OpenRequest& request)
{
if (HasFeature(m_ios.GetVersion(), Feature::NewUSB))

1
Source/Core/Core/IOS/USB/OH0/OH0.h
View file

@ -37,7 +37,6 @@ class OH0 final : public USBHost
{
public:
OH0(Kernel& ios, const std::string& device_name);
~OH0() override;
IPCCommandResult Open(const OpenRequest& request) override;
IPCCommandResult IOCtl(const IOCtlRequest& request) override;

5
Source/Core/Core/IOS/USB/USBV5.cpp
View file

@ -86,11 +86,6 @@ struct DeviceEntry
#pragma pack(pop)
} // namespace
USBV5ResourceManager::~USBV5ResourceManager()
{
StopThreads();
}
void USBV5ResourceManager::DoState(PointerWrap& p)
{
p.Do(m_devicechange_first_call);

1
Source/Core/Core/IOS/USB/USBV5.h
View file

@ -69,7 +69,6 @@ class USBV5ResourceManager : public USBHost
{
public:
using USBHost::USBHost;
~USBV5ResourceManager() override;
IPCCommandResult IOCtl(const IOCtlRequest& request) override = 0;
IPCCommandResult IOCtlV(const IOCtlVRequest& request) override = 0;

5
Source/Core/Core/IOS/USB/USB_HID/HIDv4.cpp
View file

@ -26,11 +26,6 @@ USB_HIDv4::USB_HIDv4(Kernel& ios, const std::string& device_name) : USBHost(ios,
{
}
USB_HIDv4::~USB_HIDv4()
{
StopThreads();
}
IPCCommandResult USB_HIDv4::IOCtl(const IOCtlRequest& request)
{
request.Log(GetDeviceName(), Common::Log::IOS_USB);

1
Source/Core/Core/IOS/USB/USB_HID/HIDv4.h
View file

@ -22,7 +22,6 @@ class USB_HIDv4 final : public USBHost
{
public:
USB_HIDv4(Kernel& ios, const std::string& device_name);
~USB_HIDv4() override;
IPCCommandResult IOCtl(const IOCtlRequest& request) override;