ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Timer: Don't let writes affect IRQ state

This commit is contained in:
Connor McLaughlin 2020-04-25 14:17:44 +10:00
parent 72f6503bec
commit 7fae169bbb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/timers.cpp
View File

@ -25,6 +25,7 @@ void Timers::Reset()
for (CounterState& cs : m_states) for (CounterState& cs : m_states)
{ {
cs.mode.bits = 0; cs.mode.bits = 0;
cs.mode.interrupt_request_n = true;
cs.counter = 0; cs.counter = 0;
cs.target = 0; cs.target = 0;
cs.gate = false; cs.gate = false;
@ -231,13 +232,13 @@ void Timers::WriteRegister(u32 offset, u32 value)
case 0x04: case 0x04:
{ {
static constexpr u32 WRITE_MASK = 0b1110001111111111;
Log_DebugPrintf("Timer %u write mode register 0x%04X", timer_index, value); Log_DebugPrintf("Timer %u write mode register 0x%04X", timer_index, value);
cs.mode.bits = value & u32(0x1FFF); cs.mode.bits = (value & WRITE_MASK) | (cs.mode.bits & ~WRITE_MASK);
cs.use_external_clock = (cs.mode.clock_source & (timer_index == 2 ? 2 : 1)) != 0; cs.use_external_clock = (cs.mode.clock_source & (timer_index == 2 ? 2 : 1)) != 0;
cs.counter = 0; cs.counter = 0;
cs.irq_done = false; cs.irq_done = false;
if (cs.mode.irq_pulse_n)
cs.mode.interrupt_request_n = true;
UpdateCountingEnabled(cs); UpdateCountingEnabled(cs);
UpdateIRQ(timer_index); UpdateIRQ(timer_index);