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

s3,s4,s6,s6a,s7: fixed audio bugs that I'd left behind.

Browse Source
This commit is contained in:
Robbbert 2022-01-26 18:09:57 +11:00
parent 528e7a7897
commit b224754f90
5 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/mame/audio/williams.cpp
View File

@ -33,7 +33,6 @@
#include "emu.h"
#include "williams.h"
#include "machine/6821pia.h"
#include "machine/input_merger.h"
#include "machine/rescap.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
@ -864,12 +863,9 @@ williams_s4_sound_device::williams_s4_sound_device(const machine_config &mconfig
void williams_s4_sound_device::write(u8 data)
{
// If bit 7 low, make bit 4 low, to make the startup tune work
if (~data & 0x80)
data &= 0xef;
// Handle S2 (electronic or tones)
data ^= (ioport("S4")->read() & 0x40);
if ((data & 0x1f) != 0x1f)
data &= ioport("S4")->read();
if ((data & 0x9f) != 0x9f)
{
m_pia->portb_w(data);
m_pia->cb1_w(0);
@ -903,10 +899,8 @@ void williams_s4_sound_device::device_add_mconfig(machine_config &config)
PIA6821(config, m_pia, 0);
m_pia->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
m_pia->irqa_handler().set("audioirq", FUNC(input_merger_device::in_w<1>));
m_pia->irqb_handler().set("audioirq", FUNC(input_merger_device::in_w<2>));
INPUT_MERGER_ANY_HIGH(config, "audioirq").output_handler().set_inputline(m_cpu, M6808_IRQ_LINE);
m_pia->irqa_handler().set_inputline(m_cpu, M6808_IRQ_LINE);
m_pia->irqb_handler().set_inputline(m_cpu, M6808_IRQ_LINE);
}
@ -933,10 +927,11 @@ void williams_s4_sound_device::device_reset()
INPUT_PORTS_START( williams_s4 )
PORT_START("S4")
PORT_BIT( 0xbf, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_DIPNAME( 0x40, 0x00, "Sounds" )
PORT_DIPSETTING( 0x00, "Set 1" )
PORT_DIPSETTING( 0x40, "Set 2" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s4_sound_device, audio_nmi, 1)
PORT_BIT( 0x100, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s4_sound_device, audio_nmi, 1)
INPUT_PORTS_END
INPUT_CHANGED_MEMBER( williams_s4_sound_device::audio_nmi )
@ -980,9 +975,10 @@ williams_s6_sound_device::williams_s6_sound_device(const machine_config &mconfig
void williams_s6_sound_device::write(u8 data)
{
data = bitswap<8>(data, 6, 7, 5, 4, 3, 2, 1, 0) | 0x40;
// Handle dips
data ^= (ioport("S6")->read() & 0x60);
if ((data & 0x1f) != 0x1f)
data &= ioport("S6")->read();
if ((data & 0x9f) != 0x9f)
{
m_pia->portb_w(data);
m_pia->cb1_w(0);
@ -990,6 +986,15 @@ void williams_s6_sound_device::write(u8 data)
m_pia->cb1_w(1);
}
//-------------------------------------------------
// pb_w - acknowledge interrupt
//-------------------------------------------------
void williams_s6_sound_device::pb_w(u8 data)
{
m_pia->cb1_w(1);
}
//-------------------------------------------------
// audio CPU map
//-------------------------------------------------
@ -1018,12 +1023,11 @@ void williams_s6_sound_device::device_add_mconfig(machine_config &config)
PIA6821(config, m_pia, 0);
m_pia->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
m_pia->writepb_handler().set(FUNC(williams_s6_sound_device::pb_w));
m_pia->ca2_handler().set(m_hc, FUNC(hc55516_device::digit_w));
m_pia->cb2_handler().set(m_hc, FUNC(hc55516_device::clock_w));
m_pia->irqa_handler().set("audioirq", FUNC(input_merger_device::in_w<1>));
m_pia->irqb_handler().set("audioirq", FUNC(input_merger_device::in_w<2>));
INPUT_MERGER_ANY_HIGH(config, "audioirq").output_handler().set_inputline(m_cpu, M6802_IRQ_LINE);
m_pia->irqa_handler().set_inputline(m_cpu, M6802_IRQ_LINE);
m_pia->irqb_handler().set_inputline(m_cpu, M6802_IRQ_LINE);
}
@ -1050,13 +1054,14 @@ void williams_s6_sound_device::device_reset()
INPUT_PORTS_START( williams_s6 )
PORT_START("S6")
PORT_DIPNAME( 0x20, 0x20, "Speech" )
PORT_DIPSETTING( 0x00, "Off" )
PORT_DIPSETTING( 0x20, "On" )
PORT_DIPNAME( 0x40, 0x00, "Sounds" )
PORT_DIPSETTING( 0x00, "Set 1" )
PORT_DIPSETTING( 0x40, "Set 2" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s6_sound_device, audio_nmi, 1)
PORT_BIT( 0x9f, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_DIPNAME( 0x20, 0x00, "Speech" )
PORT_DIPSETTING( 0x20, "Off" )
PORT_DIPSETTING( 0x00, "On" )
PORT_DIPNAME( 0x40, 0x40, "Sounds" )
PORT_DIPSETTING( 0x00, "Tones" )
PORT_DIPSETTING( 0x40, "Synth" )
PORT_BIT( 0x100, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s6_sound_device, audio_nmi, 1)
INPUT_PORTS_END
INPUT_CHANGED_MEMBER( williams_s6_sound_device::audio_nmi )

1
src/mame/audio/williams.h
View File

@ -245,6 +245,7 @@ protected:
virtual void device_reset() override;
private:
void pb_w(u8 data);
// devices
void williams_s6_map(address_map &map);
required_device<m6802_cpu_device> m_cpu;

2
src/mame/drivers/s6.cpp
View File

@ -327,7 +327,7 @@ void s6_state::sol0_w(u8 data)
void s6_state::sol1_w(u8 data)
{
u8 sound_data = data & 0x1f;
u8 sound_data = data & 0x7f;
m_s6sound->write(~sound_data);

2
src/mame/drivers/s6a.cpp
View File

@ -251,7 +251,7 @@ void s6a_state::sol0_w(u8 data)
void s6a_state::sol1_w(u8 data)
{
u8 sound_data = data & 0x1f;
u8 sound_data = data & 0x7f;
m_s6sound->write(~sound_data);

5
src/mame/drivers/s7.cpp
View File

@ -56,7 +56,7 @@ Starlight 530 AS hit 1 AS
Status:
- All machines are playable
- Very rarely, machines can go berzerk if you hit too many keys quickly
- Thunderball: turn Speech DIP off, or you get corrupt sound.
ToDo:
- Some games have an additional alphanumeric display, or different display arrangements
@ -528,7 +528,8 @@ void s7_state::sol2_w(u8 data)
void s7_state::sound_w(u8 data)
{
u8 t = m_game ? 0x3f : 0x1f;
m_s6sound->write(data & t);
u8 t3 = (data & t) | ~t;
m_s6sound->write(t3);
// PA7 solenoid
m_io_outputs[23] = BIT(data, 7);