Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-21 07:52:35 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

apple/iosb.cpp: Correct ASC IRQ polarity, fixes lockup during sound playback on macquadra800.cpp machines. [R. Belmont]

Browse Source 
devices/sound/asc.cpp: Fix half-full flag for all variants and add IRQ gate for Sonora/Aardbeg, gives smooth playback on all chip variants. [R. Belmont]
This commit is contained in:
arbee 2023-07-23 14:04:22 -04:00
parent 0ab1fb0606
commit 4df50ea208
2 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/devices/sound/asc.cpp
View File

@ -33,6 +33,8 @@
0x828: WAVETABLE 3 PHASE
0x82C: WAVETABLE 3 INCREMENT
TODO: rewrite this, we know so much more now and the "chip variant type" pattern must die.
***************************************************************************/
#include "emu.h"
@ -207,7 +209,39 @@ void asc_device::sound_stream_update(sound_stream &stream, std::vector<read_stre
}
break;
default: // V8/Sonora/Eagle/etc
// Sonora sets the 1/2 full flag continuously, ASC/EASC only does it when it happens
case asc_type::SONORA:
case asc_type::ARDBEG:
if (m_fifo_cap_a <= 0x200)
{
m_regs[R_FIFOSTAT-0x800] |= 1; // fifo A less than half full
if (m_fifo_cap_a == 0) // fifo A fully empty
{
m_regs[R_FIFOSTAT-0x800] |= 2; // fifo A empty
}
if (!(m_regs[0xf09 - 0x800] & 1))
{
write_irq(ASSERT_LINE);
}
}
if (m_fifo_cap_b <= 0x200)
{
m_regs[R_FIFOSTAT-0x800] |= 4; // fifo B less than half full
if (m_fifo_cap_b == 0) // fifo B fully empty
{
m_regs[R_FIFOSTAT-0x800] |= 8; // fifo B empty
}
if (!(m_regs[0xf29 - 0x800] & 1))
{
write_irq(ASSERT_LINE);
}
}
break;
default: // V8/Eagle/etc
if (m_fifo_cap_a < 0x1ff)
{
m_regs[R_FIFOSTAT-0x800] |= 1; // fifo A less than half full
@ -218,20 +252,6 @@ void asc_device::sound_stream_update(sound_stream &stream, std::vector<read_stre
}
write_irq(ASSERT_LINE);
}
if (m_chip_type == asc_type::SONORA)
{
if (m_fifo_cap_b < 0x1ff)
{
m_regs[R_FIFOSTAT-0x800] |= 4; // fifo B less than half full
if (m_fifo_cap_b == 0) // fifo B fully empty
{
m_regs[R_FIFOSTAT-0x800] |= 8; // fifo B empty
}
write_irq(ASSERT_LINE);
}
}
break;
}
@ -437,14 +457,21 @@ void asc_device::write(offs_t offset, uint8_t data)
{
if (m_regs[R_MODE-0x800] == 1)
{
if (m_fifo_cap_a >= 0x400) printf("Overflow FIFO A!\n");
m_fifo_a[m_fifo_a_wrptr++] = data;
m_fifo_cap_a++;
if (m_fifo_cap_a == 0x3ff)
if (m_fifo_cap_a == 0x400)
{
m_regs[R_FIFOSTAT-0x800] |= 2; // fifo A full
}
if (m_fifo_cap_a > 0x200)
{
m_regs[R_FIFOSTAT-0x800] &= ~1;
}
m_fifo_a_wrptr &= 0x3ff;
}
else
@ -459,11 +486,16 @@ void asc_device::write(offs_t offset, uint8_t data)
m_fifo_b[m_fifo_b_wrptr++] = data;
m_fifo_cap_b++;
if (m_fifo_cap_b == 0x3ff)
if (m_fifo_cap_b == 0x400)
{
m_regs[R_FIFOSTAT-0x800] |= 8; // fifo B full
}
if (m_fifo_cap_b > 0x200)
{
m_regs[R_FIFOSTAT-0x800] &= ~4;
}
m_fifo_b_wrptr &= 0x3ff;
}
else

2
src/mame/apple/iosb.cpp
View File

@ -329,7 +329,7 @@ void iosb_device::scsi_irq_w(int state)
void iosb_device::asc_irq(int state)
{
m_via2->write_cb1(state);
m_via2->write_cb1(state ^ 1);
m_asc_irq = state;
}