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

Improvements to VIA AC97 per suggestions

Browse Source
This commit is contained in:
RichardG867
2021-07-23 01:07:53 -03:00
parent b5e0cbd152
commit 562bbe167c
1 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/sound/snd_ac97_via.c
View File

@@ -111,34 +111,20 @@ ac97_via_read_status(void *priv, uint8_t modem)
return ret; return ret;
} }
#include <86box/nmi.h>
static void static void
ac97_via_update_irqs(ac97_via_t *dev, uint8_t iflag_clear) ac97_via_update_irqs(ac97_via_t *dev, uint8_t iflag_clear)
{ {
uint8_t do_irq = 0;
/* Check interrupt flags on all SGDs. */ /* Check interrupt flags on all SGDs. */
for (uint8_t i = 0; i < (sizeof(dev->sgd) / sizeof(dev->sgd[0])); i++) { for (uint8_t i = 0; i < (sizeof(dev->sgd) / sizeof(dev->sgd[0])); i++)
if (dev->sgd_regs[i << 4] & (dev->sgd_regs[(i << 4) | 0x02] & 0x03)) { do_irq |= (dev->sgd_regs[i << 4] & (dev->sgd_regs[(i << 4) | 0x02] & 0x03));
ac97_via_log("AC97 VIA: Setting IRQ (sgd %d iflags %02X stuck %d)\n",
i, dev->sgd_regs[i << 4] & (dev->sgd_regs[(i << 4) | 0x02] & 0x03), dev->irq_stuck);
if (dev->irq_stuck && !iflag_clear) { if (do_irq)
#ifdef ENABLE_AC97_VIA_LOG pci_set_irq(dev->slot, dev->irq_pin);
ac97_via_lost_irqs++; else
#endif pci_clear_irq(dev->slot, dev->irq_pin);
pci_clear_irq(dev->slot, dev->irq_pin);
} else {
pci_set_irq(dev->slot, dev->irq_pin);
}
dev->irq_stuck = !dev->irq_stuck;
return;
}
}
/* No interrupt pending. */
//ac97_via_log("AC97 VIA: Clearing IRQ\n");
pci_clear_irq(dev->slot, dev->irq_pin);
dev->irq_stuck = 0;
} }
@@ -495,7 +481,7 @@ ac97_via_sgd_process(void *priv)
if (!sgd->sample_ptr) { if (!sgd->sample_ptr) {
/* Start at first entry if no pointer is present. */ /* Start at first entry if no pointer is present. */
if (!sgd->entry_ptr) if (!sgd->entry_ptr)
sgd->entry_ptr = (dev->sgd_regs[sgd->id | 0x7] << 24) | (dev->sgd_regs[sgd->id | 0x6] << 16) | (dev->sgd_regs[sgd->id | 0x5] << 8) | (dev->sgd_regs[sgd->id | 0x4] & 0xfe); sgd->entry_ptr = *((uint32_t *) &dev->sgd_regs[sgd->id | 0x4]) & 0xfffffffe;
/* Read entry. */ /* Read entry. */
sgd->sample_ptr = mem_readl_phys(sgd->entry_ptr); sgd->sample_ptr = mem_readl_phys(sgd->entry_ptr);
@@ -517,8 +503,8 @@ ac97_via_sgd_process(void *priv)
} }
if (sgd->id & 0x10) { if (sgd->id & 0x10) {
/* Write channel: read data from FIFO. */ /* Write channel: read data from FIFO. */
mem_writel_phys(sgd->sample_ptr, *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)])); mem_writel_phys(sgd->sample_ptr, *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]));
} else { } else {
/* Read channel: write data to FIFO. */ /* Read channel: write data to FIFO. */
*((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]) = mem_readl_phys(sgd->sample_ptr); *((uint32_t *) &sgd->fifo[sgd->fifo_end & (sizeof(sgd->fifo) - 1)]) = mem_readl_phys(sgd->sample_ptr);