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

Revert "Only delay DI command replies." 

Fix "Wii Party" again.

This reverts commit fb5b5e8b63.
This commit is contained in:
Jordan Woyak 2013-02-05 02:51:34 -06:00
parent d0190faded
commit 937d9e9007
4 changed files with 2 additions and 16 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,7 +405,6 @@ void ExecuteCommand(u32 _Address)
else else
{ {
delete pDevice; delete pDevice;
pDevice = NULL;
} }
} }
@ -436,10 +435,7 @@ 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
{ {
@ -519,8 +515,8 @@ void ExecuteCommand(u32 _Address)
if (CmdSuccess) if (CmdSuccess)
{ {
// Generate a reply to the IPC command // Generate a reply to the IPC command
int const reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0; // TODO: should probably figure out which commands need delayed replies and which don't
EnqReply(_Address, reply_delay); EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 100);
} }
else else
{ {

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

@ -95,8 +95,6 @@ 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; }

6
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
View File

@ -28,7 +28,6 @@
#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"
@ -461,8 +460,3 @@ 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)
{
return SystemTimers::GetTicksPerSecond() / 100;
}

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

@ -39,8 +39,6 @@ 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);