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

Used the scheduler to generate the interrupt for IPC. Fixes the ES_LAUNCH games.

This commit is contained in:
skidau 2013-03-13 22:23:59 +11:00
parent 0b34457a8e
commit 85eab1d262
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@
#include "../IPC_HLE/WII_IPC_HLE.h" #include "../IPC_HLE/WII_IPC_HLE.h"
#include "WII_IPC.h" #include "WII_IPC.h"
#include "CoreTiming.h"
// This is the intercommunication between ARM and PPC. Currently only PPC actually uses it, because of the IOS HLE // This is the intercommunication between ARM and PPC. Currently only PPC actually uses it, because of the IOS HLE
@ -104,6 +105,8 @@ static u32 arm_irq_masks;
static u32 sensorbar_power; // do we need to care about this? static u32 sensorbar_power; // do we need to care about this?
int updateInterrupts;
void DoState(PointerWrap &p) void DoState(PointerWrap &p)
{ {
p.Do(ppc_msg); p.Do(ppc_msg);
@ -130,6 +133,8 @@ void Init()
sensorbar_power = 0; sensorbar_power = 0;
ppc_irq_masks |= INT_CAUSE_IPC_BROADWAY; ppc_irq_masks |= INT_CAUSE_IPC_BROADWAY;
updateInterrupts = CoreTiming::RegisterEvent("IPCInterrupt", UpdateInterrupts);
} }
void Reset() void Reset()
@ -222,10 +227,10 @@ void Write32(const u32 _Value, const u32 _Address)
} }
WII_IPC_HLE_Interface::Update(); WII_IPC_HLE_Interface::Update();
UpdateInterrupts(); CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0);
} }
void UpdateInterrupts() void UpdateInterrupts(u64 userdata, int cyclesLate)
{ {
if ((ctrl.Y1 & ctrl.IY1) || (ctrl.Y2 & ctrl.IY2)) if ((ctrl.Y1 & ctrl.IY1) || (ctrl.Y2 & ctrl.IY2))
{ {
@ -247,7 +252,7 @@ void GenerateAck(u32 _Address)
ctrl.Y2 = 1; ctrl.Y2 = 1;
INFO_LOG(WII_IPC, "GenerateAck: %08x | %08x [R:%i A:%i E:%i]", INFO_LOG(WII_IPC, "GenerateAck: %08x | %08x [R:%i A:%i E:%i]",
ppc_msg,_Address, ctrl.Y1, ctrl.Y2, ctrl.X1); ppc_msg,_Address, ctrl.Y1, ctrl.Y2, ctrl.X1);
UpdateInterrupts(); CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0);
} }
void GenerateReply(u32 _Address) void GenerateReply(u32 _Address)

2
Source/Core/Core/Src/HW/WII_IPC.h
View File

@ -52,7 +52,7 @@ void DoState(PointerWrap &p);
void Read32(u32& _rReturnValue, const u32 _Address); void Read32(u32& _rReturnValue, const u32 _Address);
void Write32(const u32 _Value, const u32 _Address); void Write32(const u32 _Value, const u32 _Address);
void UpdateInterrupts(); void UpdateInterrupts(u64 userdata = 0, int cyclesLate = 0);
void GenerateAck(u32 _Address); void GenerateAck(u32 _Address);
void GenerateReply(u32 _Address); void GenerateReply(u32 _Address);