Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2025-01-03 12:30:08 +00:00
Code Issues Projects Releases Wiki Activity

grandcentral: fix interrupt masking.

Browse Source 
Use int_mask directly without changing int_events.
That permits interrupt generation on int_mask changes.
This commit is contained in:
Maxim Poliakovski 2024-09-27 14:57:09 +02:00
parent 8c42685e26
commit a649a688e7
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devices/ioctrl/grandcentral.cpp
View File

@ -388,6 +388,7 @@ void GrandCentral::write(uint32_t rgn_start, uint32_t offset, uint32_t value, in
switch (offset) {
case MIO_INT_MASK1:
this->int_mask = BYTESWAP_32(value);
this->signal_cpu_int(this->int_events & this->int_mask);
break;
case MIO_INT_CLEAR1:
if ((this->int_mask & MACIO_INT_MODE) && (value & MACIO_INT_CLR))
@ -474,14 +475,8 @@ uint32_t GrandCentral::register_dma_int(IntSrc src_id) {
}
void GrandCentral::ack_int_common(uint32_t irq_id, uint8_t irq_line_state) {
// native mode: set IRQ bits in int_events1 on a 0-to-1 transition
// emulated mode: set IRQ bits in int_events1 on all transitions
//#if 1
// if (irq_id & ~(INT_TO_IRQ_ID(0x12) | INT_TO_IRQ_ID(0x1A)))
// LOG_F(INTERRUPT, "%s: native interrupt mask:%08x events:%08x levels:%08x change:%08x state:%d",
// this->name.c_str(), this->int_mask, this->int_events + 0, this->int_levels + 0, irq_id, irq_line_state
// );
//#endif
// native mode: set IRQ bits in int_events on a 0-to-1 transition
// emulated mode: set IRQ bits in int_events on all transitions
if ((this->int_mask & MACIO_INT_MODE) ||
(irq_line_state && !(this->int_levels & irq_id))) {
this->int_events |= irq_id;
@ -489,8 +484,6 @@ void GrandCentral::ack_int_common(uint32_t irq_id, uint8_t irq_line_state) {
this->int_events &= ~irq_id;
}
this->int_events &= this->int_mask;
// update IRQ line state
if (irq_line_state) {
this->int_levels |= irq_id;
@ -510,7 +503,7 @@ void GrandCentral::ack_dma_int(uint32_t irq_id, uint8_t irq_line_state) {
}
void GrandCentral::signal_cpu_int(uint32_t irq_id) {
if (this->int_events) {
if (this->int_events & this->int_mask) {
if (!this->cpu_int_latch) {
this->cpu_int_latch = true;
ppc_assert_int();
@ -522,7 +515,7 @@ void GrandCentral::signal_cpu_int(uint32_t irq_id) {
}
void GrandCentral::clear_cpu_int() {
if (!this->int_events) {
if (!(this->int_events & this->int_mask) && this->cpu_int_latch) {
this->cpu_int_latch = false;
ppc_release_int();
LOG_F(5, "%s: CPU INT latch cleared", this->name.c_str());