mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-03-12 22:56:52 +01:00
Only delay DI and fs IPC replies.
Fixes issue 5982.
This commit is contained in:
parent
ef9d7fb789
commit
9cbfddd788
@ -405,6 +405,7 @@ void ExecuteCommand(u32 _Address)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
delete pDevice;
|
delete pDevice;
|
||||||
|
pDevice = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -435,7 +436,10 @@ void ExecuteCommand(u32 _Address)
|
|||||||
|
|
||||||
// Don't delete hardware
|
// Don't delete hardware
|
||||||
if (!pDevice->IsHardware())
|
if (!pDevice->IsHardware())
|
||||||
|
{
|
||||||
delete pDevice;
|
delete pDevice;
|
||||||
|
pDevice = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -515,8 +519,8 @@ void ExecuteCommand(u32 _Address)
|
|||||||
if (CmdSuccess)
|
if (CmdSuccess)
|
||||||
{
|
{
|
||||||
// Generate a reply to the IPC command
|
// Generate a reply to the IPC command
|
||||||
// TODO: should probably figure out which commands need delayed replies and which don't
|
int const reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0;
|
||||||
EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 100);
|
EnqReply(_Address, reply_delay);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -95,6 +95,8 @@ public:
|
|||||||
virtual bool IOCtlV (u32) { UNIMPLEMENTED_CMD(IOCtlV) }
|
virtual bool IOCtlV (u32) { UNIMPLEMENTED_CMD(IOCtlV) }
|
||||||
#undef UNIMPLEMENTED_CMD
|
#undef UNIMPLEMENTED_CMD
|
||||||
|
|
||||||
|
virtual int GetCmdDelay(u32) { return 0; }
|
||||||
|
|
||||||
virtual u32 Update() { return 0; }
|
virtual u32 Update() { return 0; }
|
||||||
|
|
||||||
virtual bool IsHardware() { return m_Hardware; }
|
virtual bool IsHardware() { return m_Hardware; }
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
#include "VolumeCreator.h"
|
#include "VolumeCreator.h"
|
||||||
#include "Filesystem.h"
|
#include "Filesystem.h"
|
||||||
#include "LogManager.h"
|
#include "LogManager.h"
|
||||||
|
#include "../HW/SystemTimers.h"
|
||||||
|
|
||||||
#include "../../DiscIO/Src/FileMonitor.h"
|
#include "../../DiscIO/Src/FileMonitor.h"
|
||||||
|
|
||||||
@ -460,3 +461,9 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
|
|||||||
// i dunno but prolly 1 is okay all the time :)
|
// i dunno but prolly 1 is okay all the time :)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int CWII_IPC_HLE_Device_di::GetCmdDelay(u32)
|
||||||
|
{
|
||||||
|
// Less than ~1/150th of a second hangs Oregon Trail at "loading wheel".
|
||||||
|
return SystemTimers::GetTicksPerSecond() / 100;
|
||||||
|
}
|
@ -39,6 +39,8 @@ public:
|
|||||||
bool IOCtl(u32 _CommandAddress);
|
bool IOCtl(u32 _CommandAddress);
|
||||||
bool IOCtlV(u32 _CommandAddress);
|
bool IOCtlV(u32 _CommandAddress);
|
||||||
|
|
||||||
|
int GetCmdDelay(u32);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
u32 ExecuteCommand(u32 BufferIn, u32 BufferInSize, u32 _BufferOut, u32 BufferOutSize);
|
u32 ExecuteCommand(u32 BufferIn, u32 BufferInSize, u32 _BufferOut, u32 BufferOutSize);
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
#include "FileUtil.h"
|
#include "FileUtil.h"
|
||||||
#include "NandPaths.h"
|
#include "NandPaths.h"
|
||||||
#include "ChunkFile.h"
|
#include "ChunkFile.h"
|
||||||
|
#include "../HW/SystemTimers.h"
|
||||||
|
|
||||||
#include "../VolumeHandler.h"
|
#include "../VolumeHandler.h"
|
||||||
|
|
||||||
@ -499,6 +500,13 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B
|
|||||||
return FS_RESULT_FATAL;
|
return FS_RESULT_FATAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int CWII_IPC_HLE_Device_fs::GetCmdDelay(u32)
|
||||||
|
{
|
||||||
|
// ~1/1000th of a second is too short and causes hangs in Wii Party
|
||||||
|
// Play it safe at 1/500th
|
||||||
|
return SystemTimers::GetTicksPerSecond() / 500;
|
||||||
|
}
|
||||||
|
|
||||||
void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
|
void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
|
||||||
{
|
{
|
||||||
DoStateShared(p);
|
DoStateShared(p);
|
||||||
|
@ -56,6 +56,8 @@ public:
|
|||||||
virtual bool IOCtl(u32 _CommandAddress);
|
virtual bool IOCtl(u32 _CommandAddress);
|
||||||
virtual bool IOCtlV(u32 _CommandAddress);
|
virtual bool IOCtlV(u32 _CommandAddress);
|
||||||
|
|
||||||
|
virtual int GetCmdDelay(u32);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
Loading…
x
Reference in New Issue
Block a user