mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-01 03:32:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Delayed the interrupts in the EXI Channel.

Browse Source 
Fixes issue 5580.
This commit is contained in:
skidau 2013-02-24 21:32:14 +11:00
parent 40b65fdc04
commit 6b28b3929a
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/Src/HW/EXI_Channel.cpp
View File

@ -25,9 +25,9 @@
#define EXI_WRITE 1 #define EXI_WRITE 1
#define EXI_READWRITE 2 #define EXI_READWRITE 2
#include "ProcessorInterface.h" #include "ProcessorInterface.h"
#include "../PowerPC/PowerPC.h" #include "../PowerPC/PowerPC.h"
#include "CoreTiming.h"
CEXIChannel::CEXIChannel(u32 ChannelId) : CEXIChannel::CEXIChannel(u32 ChannelId) :
m_DMAMemoryAddress(0), m_DMAMemoryAddress(0),
@ -45,6 +45,8 @@ CEXIChannel::CEXIChannel(u32 ChannelId) :
for (int i = 0; i < NUM_DEVICES; i++) for (int i = 0; i < NUM_DEVICES; i++)
m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE, m_ChannelId); m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE, m_ChannelId);
updateInterrupts = CoreTiming::RegisterEvent("EXIInterrupt", UpdateInterrupts);
} }
CEXIChannel::~CEXIChannel() CEXIChannel::~CEXIChannel()
@ -88,12 +90,12 @@ void CEXIChannel::AddDevice(IEXIDevice* pDevice, const int device_num, bool noti
if (m_ChannelId != 2) if (m_ChannelId != 2)
{ {
m_Status.EXTINT = 1; m_Status.EXTINT = 1;
UpdateInterrupts(); CoreTiming::ScheduleEvent_Threadsafe_Immediate(updateInterrupts, 0);
} }
} }
} }
void CEXIChannel::UpdateInterrupts() void CEXIChannel::UpdateInterrupts(u64 userdata, int cyclesLate)
{ {
ExpansionInterface::UpdateInterrupts(); ExpansionInterface::UpdateInterrupts();
} }
@ -149,7 +151,9 @@ void CEXIChannel::Read32(u32& _uReturnValue, const u32 _iRegister)
if (m_ChannelId == 2) if (m_ChannelId == 2)
m_Status.EXT = 0; m_Status.EXT = 0;
else else
{
m_Status.EXT = GetDevice(1)->IsPresent() ? 1 : 0; m_Status.EXT = GetDevice(1)->IsPresent() ? 1 : 0;
}
_uReturnValue = m_Status.Hex; _uReturnValue = m_Status.Hex;
break; break;
@ -213,7 +217,7 @@ void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister)
if (pDevice != NULL) if (pDevice != NULL)
pDevice->SetCS(m_Status.CHIP_SELECT); pDevice->SetCS(m_Status.CHIP_SELECT);
UpdateInterrupts(); CoreTiming::ScheduleEvent_Threadsafe_Immediate(updateInterrupts, 0);
} }
break; break;
@ -264,7 +268,7 @@ void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister)
if(!m_Control.TSTART) // completed ! if(!m_Control.TSTART) // completed !
{ {
m_Status.TCINT = 1; m_Status.TCINT = 1;
UpdateInterrupts(); CoreTiming::ScheduleEvent_Threadsafe_Immediate(updateInterrupts, 0);
} }
} }
break; break;

4
Source/Core/Core/Src/HW/EXI_Channel.h
View File

@ -110,6 +110,9 @@ private:
// Since channels operate a bit differently from each other // Since channels operate a bit differently from each other
u32 m_ChannelId; u32 m_ChannelId;
int updateInterrupts;
static void UpdateInterrupts(u64 userdata, int cyclesLate);
public: public:
// get device // get device
IEXIDevice* GetDevice(const u8 _CHIP_SELECT); IEXIDevice* GetDevice(const u8 _CHIP_SELECT);
@ -129,7 +132,6 @@ public:
void Update(); void Update();
bool IsCausingInterrupt(); bool IsCausingInterrupt();
void UpdateInterrupts();
void DoState(PointerWrap &p); void DoState(PointerWrap &p);
void PauseAndLock(bool doLock, bool unpauseOnUnlock); void PauseAndLock(bool doLock, bool unpauseOnUnlock);

2
Source/Core/Core/Src/HW/ProcessorInterface.cpp
View File

@ -99,7 +99,7 @@ void Init()
m_ResetCode = 0x80000000; // Cold reset m_ResetCode = 0x80000000; // Cold reset
m_InterruptCause = INT_CAUSE_RST_BUTTON | INT_CAUSE_VI; m_InterruptCause = INT_CAUSE_RST_BUTTON | INT_CAUSE_VI;
toggleResetButton = CoreTiming::RegisterEvent("ToggleResetButton", &ToggleResetButtonCallback); toggleResetButton = CoreTiming::RegisterEvent("ToggleResetButton", ToggleResetButtonCallback);
} }
void Read16(u16& _uReturnValue, const u32 _iAddress) void Read16(u16& _uReturnValue, const u32 _iAddress)