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

Only delay DI and fs IPC replies.

Browse source 
Fixes issue 5982.
This commit is contained in:
Jordan Woyak 2013-02-06 16:52:51 -06:00
parent ef9d7fb789
commit 9cbfddd788
6 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
View file

@ -405,6 +405,7 @@ void ExecuteCommand(u32 _Address)
else
{
delete pDevice;
pDevice = NULL;
}
}
@ -435,7 +436,10 @@ void ExecuteCommand(u32 _Address)
// Don't delete hardware
if (!pDevice->IsHardware())
{
delete pDevice;
pDevice = NULL;
}
}
else
{
@ -515,8 +519,8 @@ void ExecuteCommand(u32 _Address)
if (CmdSuccess)
{
// Generate a reply to the IPC command
// TODO: should probably figure out which commands need delayed replies and which don't
EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 100);
int const reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0;
EnqReply(_Address, reply_delay);
}
else
{

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h
View file

@ -95,6 +95,8 @@ public:
virtual bool IOCtlV (u32) { UNIMPLEMENTED_CMD(IOCtlV) }
#undef UNIMPLEMENTED_CMD
virtual int GetCmdDelay(u32) { return 0; }
virtual u32 Update() { return 0; }
virtual bool IsHardware() { return m_Hardware; }

7
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
View file

@ -28,6 +28,7 @@
#include "VolumeCreator.h"
#include "Filesystem.h"
#include "LogManager.h"
#include "../HW/SystemTimers.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 :)
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;
}

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h
View file

@ -38,6 +38,8 @@ public:
bool IOCtl(u32 _CommandAddress);
bool IOCtlV(u32 _CommandAddress);
int GetCmdDelay(u32);
private:

8
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
View file

@ -26,6 +26,7 @@
#include "FileUtil.h"
#include "NandPaths.h"
#include "ChunkFile.h"
#include "../HW/SystemTimers.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;
}
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)
{
DoStateShared(p);

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h
View file

@ -55,6 +55,8 @@ public:
virtual bool IOCtl(u32 _CommandAddress);
virtual bool IOCtlV(u32 _CommandAddress);
virtual int GetCmdDelay(u32);
private: