ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3125 from JosJuice/di-callback-pointer 

Simplify getting DI pointer in IOCtl callback
This commit is contained in:
shuffle2 2015-10-03 17:52:58 -07:00
parent b4be34bc68 bf2676a1b1
commit f5c88fc1a9
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
View File

@ -16,31 +16,25 @@
#include "Core/IPC_HLE/WII_IPC_HLE.h" #include "Core/IPC_HLE/WII_IPC_HLE.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"
static CWII_IPC_HLE_Device_di* g_di_pointer;
static int ioctl_callback; static int ioctl_callback;
static void IOCtlCallback(u64 userdata, int cycles_late) static void IOCtlCallback(u64 userdata, int cycles_late)
{ {
if (g_di_pointer != nullptr) std::shared_ptr<IWII_IPC_HLE_Device> di = WII_IPC_HLE_Interface::GetDeviceByName("/dev/di");
g_di_pointer->FinishIOCtl((DVDInterface::DIInterruptType)userdata); if (di)
std::static_pointer_cast<CWII_IPC_HLE_Device_di>(di)->FinishIOCtl((DVDInterface::DIInterruptType)userdata);
// If g_di_pointer == nullptr, IOS was probably shut down, // If di == nullptr, IOS was probably shut down, so the command shouldn't be completed
// so the command shouldn't be completed
} }
CWII_IPC_HLE_Device_di::CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName) CWII_IPC_HLE_Device_di::CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName)
: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
{ {
if (g_di_pointer == nullptr)
ERROR_LOG(WII_IPC_DVD, "Trying to run two DI devices at once. IOCtl may not behave as expected.");
g_di_pointer = this;
ioctl_callback = CoreTiming::RegisterEvent("IOCtlCallbackDI", IOCtlCallback); ioctl_callback = CoreTiming::RegisterEvent("IOCtlCallbackDI", IOCtlCallback);
} }
CWII_IPC_HLE_Device_di::~CWII_IPC_HLE_Device_di() CWII_IPC_HLE_Device_di::~CWII_IPC_HLE_Device_di()
{ {
g_di_pointer = nullptr;
} }
void CWII_IPC_HLE_Device_di::DoState(PointerWrap& p) void CWII_IPC_HLE_Device_di::DoState(PointerWrap& p)