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

Back to broken ES_launch but 4 wiimotes working.

This commit is contained in:
Matthew Parlane 2013-04-25 15:28:42 +12:00
parent 7c50ac931d
commit d18b71ccf9
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/HW/WII_IPC.cpp
View File

@ -182,7 +182,6 @@ void Write32(const u32 _Value, const u32 _Address)
if (ctrl.X1) if (ctrl.X1)
{ {
INFO_LOG(WII_IPC, "New pointer available: %08x", ppc_msg); INFO_LOG(WII_IPC, "New pointer available: %08x", ppc_msg);
WII_IPC_HLE_Interface::Update();
// Let the HLE handle the request on it's own time // Let the HLE handle the request on it's own time
WII_IPC_HLE_Interface::EnqRequest(ppc_msg); WII_IPC_HLE_Interface::EnqRequest(ppc_msg);
} }
@ -214,10 +213,7 @@ void Write32(const u32 _Value, const u32 _Address)
break; break;
} }
if((_Address & 0xFFFF) != IPC_PPCCTRL)
{
WII_IPC_HLE_Interface::Update(); WII_IPC_HLE_Interface::Update();
}
CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0); CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0);
} }

5
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -564,10 +564,9 @@ void Update()
{ {
WII_IPCInterface::GenerateAck(request_queue.front()); WII_IPCInterface::GenerateAck(request_queue.front());
INFO_LOG(WII_IPC_HLE, "||-- Acknowledge IPC Request @ 0x%08x", request_queue.front()); INFO_LOG(WII_IPC_HLE, "||-- Acknowledge IPC Request @ 0x%08x", request_queue.front());
u32 command = request_queue.front();
ExecuteCommand(request_queue.front());
if(request_queue.size())
request_queue.pop_front(); request_queue.pop_front();
ExecuteCommand(command);
#if MAX_LOGLEVEL >= DEBUG_LEVEL #if MAX_LOGLEVEL >= DEBUG_LEVEL
Dolphin_Debugger::PrintCallstack(LogTypes::WII_IPC_HLE, LogTypes::LDEBUG); Dolphin_Debugger::PrintCallstack(LogTypes::WII_IPC_HLE, LogTypes::LDEBUG);