claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Serial port IRQ clean-ups.

Browse Source
This commit is contained in:
OBattler
2023-08-07 04:06:04 +02:00
parent fd1fdd3792
commit ced0a649be
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/device/serial.c
View File

@@ -106,6 +106,13 @@ serial_transmit_period(serial_t *dev)
dev->sd->transmit_period_callback(dev, dev->sd->priv, dev->transmit_period); dev->sd->transmit_period_callback(dev, dev->sd->priv, dev->transmit_period);
} }
void
serial_do_irq(serial_t *dev, int set)
{
if (dev->irq != 0xff)
picint_common(1 << dev->irq, !!(dev->type >= SERIAL_16450), set, &dev->irq_state);
}
void void
serial_update_ints(serial_t *dev) serial_update_ints(serial_t *dev)
{ {
@@ -135,17 +142,7 @@ serial_update_ints(serial_t *dev)
dev->iir = 0; dev->iir = 0;
} }
if (stat && (dev->irq != 0xff) && ((dev->mctrl & 8) || (dev->type == SERIAL_8250_PCJR))) { serial_do_irq(dev, stat && ((dev->mctrl & 8) || (dev->type == SERIAL_8250_PCJR)));
if (dev->type >= SERIAL_16450)
picintlevel(1 << dev->irq, &dev->irq_state);
else
picint(1 << dev->irq);
} else {
if (dev->type >= SERIAL_16450)
picintclevel(1 << dev->irq, &dev->irq_state);
else
picintc(1 << dev->irq);
}
} }
static void static void
@@ -603,7 +600,7 @@ serial_write(uint16_t addr, uint8_t val, void *p)
dev->sd->rcr_callback(dev, dev->sd->priv); dev->sd->rcr_callback(dev, dev->sd->priv);
} }
if (!(val & 8) && (dev->mctrl & 8)) if (!(val & 8) && (dev->mctrl & 8))
picintc(1 << dev->irq); serial_do_irq(dev, 0);
if ((val ^ dev->mctrl) & 0x10) if ((val ^ dev->mctrl) & 0x10)
serial_reset_fifo(dev); serial_reset_fifo(dev);
dev->mctrl = val; dev->mctrl = val;