From 983cd204112cceaeb4dfd5dc97b6194552e79df5 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Sun, 30 Jun 2019 16:57:02 +1000 Subject: (nw) more cassette wave sound --- src/mame/drivers/jupace.cpp | 2 +- src/mame/drivers/kc.cpp | 4 ++-- src/mame/drivers/kim1.cpp | 5 +++++ src/mame/drivers/lviv.cpp | 2 +- src/mame/drivers/m5.cpp | 2 ++ src/mame/drivers/mc10.cpp | 3 +++ src/mame/drivers/mc1000.cpp | 2 ++ src/mame/drivers/mc1502.cpp | 2 +- src/mame/drivers/mekd2.cpp | 2 +- src/mame/drivers/mikro80.cpp | 2 +- src/mame/drivers/mikrosha.cpp | 2 +- src/mame/drivers/mk14.cpp | 1 + src/mame/drivers/mkit09.cpp | 4 ++-- src/mame/drivers/msx.cpp | 6 +++--- src/mame/drivers/mz2000.cpp | 2 +- src/mame/drivers/ondra.cpp | 2 +- src/mame/drivers/oric.cpp | 2 +- src/mame/drivers/orion.cpp | 6 +++--- src/mame/drivers/pp01.cpp | 13 ++++++++++--- 19 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index 453a6828dc0..0c8e8c8103c 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -776,7 +776,7 @@ MACHINE_CONFIG_START(ace_state::ace) // sound hardware SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 1.00); AY8910(config, AY8910_TAG, XTAL(6'500'000) / 2).add_route(ALL_OUTPUTS, "mono", 0.25); diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp index 38bebdf1a0a..8130cf9ca4b 100644 --- a/src/mame/drivers/kc.cpp +++ b/src/mame/drivers/kc.cpp @@ -135,7 +135,7 @@ void kc_state::kc85_3(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* devices */ @@ -214,7 +214,7 @@ void kc85_4_state::kc85_4(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* devices */ diff --git a/src/mame/drivers/kim1.cpp b/src/mame/drivers/kim1.cpp index 2fc01cbef0c..8ea5b74bc28 100644 --- a/src/mame/drivers/kim1.cpp +++ b/src/mame/drivers/kim1.cpp @@ -60,6 +60,8 @@ TODO: #include "emu.h" #include "includes/kim1.h" +#include "sound/wave.h" +#include "speaker.h" #include "kim1.lh" //************************************************************************** @@ -264,6 +266,9 @@ void kim1_state::kim1(machine_config &config) m_cass->set_default_state(CASSETTE_STOPPED); m_cass->set_interface ("kim1_cass"); + SPEAKER(config, "mono").front_center(); + WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05); + TIMER(config, "led_timer").configure_periodic(FUNC(kim1_state::kim1_update_leds), attotime::from_hz(60)); TIMER(config, "cassette_timer").configure_periodic(FUNC(kim1_state::kim1_cassette_input), attotime::from_hz(44100)); diff --git a/src/mame/drivers/lviv.cpp b/src/mame/drivers/lviv.cpp index 251f3e03dda..948b77be8ba 100644 --- a/src/mame/drivers/lviv.cpp +++ b/src/mame/drivers/lviv.cpp @@ -457,7 +457,7 @@ MACHINE_CONFIG_START(lviv_state::lviv) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* snapshot */ diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index 74ec56eb5ac..a4231a7c30c 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -280,6 +280,7 @@ Few other notes: #include "machine/z80daisy.h" #include "machine/z80ctc.h" #include "sound/sn76496.h" +#include "sound/wave.h" #include "video/tms9928a.h" #include "bus/m5/rom.h" @@ -1417,6 +1418,7 @@ void m5_state::m5(machine_config &config) // sound hardware SPEAKER(config, "mono").front_center(); SN76489A(config, SN76489AN_TAG, 14.318181_MHz_XTAL / 4).add_route(ALL_OUTPUTS, "mono", 1.00); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); // devices Z80CTC(config, m_ctc, 14.318181_MHz_XTAL / 4); diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp index 0162ae4befc..02cec394ae0 100644 --- a/src/mame/drivers/mc10.cpp +++ b/src/mame/drivers/mc10.cpp @@ -16,6 +16,7 @@ #include "machine/timer.h" #include "sound/dac.h" #include "sound/volt_reg.h" +#include "sound/wave.h" #include "video/ef9345.h" #include "video/mc6847.h" @@ -524,6 +525,7 @@ void mc10_state::mc10(machine_config &config) DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.0625); voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); CASSETTE(config, m_cassette); m_cassette->set_formats(coco_cassette_formats); @@ -566,6 +568,7 @@ void mc10_state::alice32(machine_config &config) DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.0625); voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); CASSETTE(config, m_cassette); m_cassette->set_formats(alice32_cassette_formats); diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp index 0e97e92265d..e65f3834a43 100644 --- a/src/mame/drivers/mc1000.cpp +++ b/src/mame/drivers/mc1000.cpp @@ -31,6 +31,7 @@ #include "machine/rescap.h" #include "machine/timer.h" #include "sound/ay8910.h" +#include "sound/wave.h" #include "video/mc6845.h" #include "video/mc6847.h" @@ -576,6 +577,7 @@ void mc1000_state::mc1000(machine_config &config) ay8910.port_b_read_callback().set(FUNC(mc1000_state::keydata_r)); ay8910.port_a_write_callback().set(FUNC(mc1000_state::keylatch_w)); ay8910.add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); /* devices */ CASSETTE(config, m_cassette); diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp index 21dc9813aeb..aa7d573dc78 100644 --- a/src/mame/drivers/mc1502.cpp +++ b/src/mame/drivers/mc1502.cpp @@ -291,7 +291,7 @@ void mc1502_state::mc1502(machine_config &config) ISA8_SLOT(config, "isa2", 0, "isa", mc1502_isa8_cards, "rom", false); SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette); // FIXME: really no output routes for the cassette sound? + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.80); CENTRONICS(config, m_centronics, centronics_devices, "printer"); diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp index 954bbc4aa3d..35f1080980a 100644 --- a/src/mame/drivers/mekd2.cpp +++ b/src/mame/drivers/mekd2.cpp @@ -379,7 +379,7 @@ void mekd2_state::mekd2(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); CASSETTE(config, m_cass); diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp index 206a603adf1..5f8679b751c 100644 --- a/src/mame/drivers/mikro80.cpp +++ b/src/mame/drivers/mikro80.cpp @@ -190,7 +190,7 @@ void mikro80_state::mikro80(machine_config &config) PALETTE(config, "palette", palette_device::MONOCHROME); SPEAKER(config, "speaker").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.25); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); CASSETTE(config, m_cassette); m_cassette->set_formats(rk8_cassette_formats); diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp index 414f0c7414c..a059a5cf020 100644 --- a/src/mame/drivers/mikrosha.cpp +++ b/src/mame/drivers/mikrosha.cpp @@ -241,7 +241,7 @@ void mikrosha_state::mikrosha(machine_config &config) PALETTE(config, m_palette, FUNC(mikrosha_state::radio86_palette), 3); SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); I8257(config, m_dma8257, XTAL(16'000'000) / 9); m_dma8257->out_hrq_cb().set(FUNC(radio86_state::hrq_w)); diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp index 076e88fe577..331e53fcb2a 100644 --- a/src/mame/drivers/mk14.cpp +++ b/src/mame/drivers/mk14.cpp @@ -233,6 +233,7 @@ void mk14_state::mk14(machine_config &config) ic8.out_b().set("dac8", FUNC(dac_byte_interface::data_w)); CASSETTE(config, m_cass); + m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); } /* ROM definition */ diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp index ab05909ab31..3f660533415 100644 --- a/src/mame/drivers/mkit09.cpp +++ b/src/mame/drivers/mkit09.cpp @@ -209,7 +209,7 @@ void mkit09_state::mkit09(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); /* Devices */ PIA6821(config, m_pia, 0); @@ -234,7 +234,7 @@ void mkit09_state::mkit09a(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); /* Devices */ PIA6821(config, m_pia, 0); diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp index bdb05dc6efc..22bdb2f9190 100644 --- a/src/mame/drivers/msx.cpp +++ b/src/mame/drivers/msx.cpp @@ -1372,7 +1372,7 @@ void msx_state::msx(machine_config &config) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.25); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); AY8910(config, m_ay8910, 10.738635_MHz_XTAL / 3 / 2); m_ay8910->set_flags(AY8910_SINGLE_OUTPUT); m_ay8910->port_a_read_callback().set(FUNC(msx_state::msx_psg_port_a_r)); @@ -1444,7 +1444,7 @@ void msx2_state::msx2(machine_config &config) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.25); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); AY8910(config, m_ay8910, 21.477272_MHz_XTAL / 6 / 2); m_ay8910->set_flags(AY8910_SINGLE_OUTPUT); m_ay8910->port_a_read_callback().set(FUNC(msx2_state::msx_psg_port_a_r)); @@ -1507,7 +1507,7 @@ void msx2_state::msx2p(machine_config &config) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.25); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); AY8910(config, m_ay8910, 21.477272_MHz_XTAL / 6 / 2); m_ay8910->set_flags(AY8910_SINGLE_OUTPUT); m_ay8910->port_a_read_callback().set(FUNC(msx2_state::msx_psg_port_a_r)); diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp index 683678c6f63..71115b12394 100644 --- a/src/mame/drivers/mz2000.cpp +++ b/src/mame/drivers/mz2000.cpp @@ -932,7 +932,7 @@ void mz2000_state::mz2000(machine_config &config) SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05); BEEP(config, "beeper", 4096).add_route(ALL_OUTPUTS,"mono",0.15); } diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp index 040e09fb591..50e9cb633ce 100644 --- a/src/mame/drivers/ondra.cpp +++ b/src/mame/drivers/ondra.cpp @@ -144,7 +144,7 @@ void ondra_state::ondra(machine_config &config) // sound hardware SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp index 538149d85ab..40bb7910396 100644 --- a/src/mame/drivers/oric.cpp +++ b/src/mame/drivers/oric.cpp @@ -802,7 +802,7 @@ void oric_state::oric(machine_config &config, bool add_ext) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); AY8912(config, m_psg, 12_MHz_XTAL / 12); m_psg->set_flags(AY8910_DISCRETE_OUTPUT); diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp index d3c78eb099e..0775ea26524 100644 --- a/src/mame/drivers/orion.cpp +++ b/src/mame/drivers/orion.cpp @@ -116,7 +116,7 @@ void orion_state::orion128(machine_config &config) PALETTE(config, m_palette, FUNC(orion_state::orion128_palette), 18); SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); auto &cassette(CASSETTE(config, "cassette")); cassette.set_formats(rko_cassette_formats); @@ -189,7 +189,7 @@ void orion_z80_state::orionz80(machine_config &config) SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 1.0); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); auto &ay8912(AY8912(config, "ay8912", 1773400)); ay8912.add_route(ALL_OUTPUTS, "mono", 1.00); @@ -262,7 +262,7 @@ void orion_pro_state::orionpro(machine_config &config) SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 1.0); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); + WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); auto &ay8912(AY8912(config, "ay8912", 1773400)); ay8912.add_route(ALL_OUTPUTS, "mono", 1.00); diff --git a/src/mame/drivers/pp01.cpp b/src/mame/drivers/pp01.cpp index 21f0d21d743..89392fac344 100644 --- a/src/mame/drivers/pp01.cpp +++ b/src/mame/drivers/pp01.cpp @@ -2,9 +2,16 @@ // copyright-holders:Miodrag Milanovic /*************************************************************************** - PP-01 driver by Miodrag Milanovic +PP-01 driver by Miodrag Milanovic - 08/09/2008 Preliminary driver. +2008-09-08 Preliminary driver. + +MONIT to enter the Monitor +M - ? +N - ? +P - to return +S - ? +Z - ? ****************************************************************************/ @@ -220,7 +227,7 @@ void pp01_state::pp01(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); - //WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); + //WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); /* Devices */ I8251(config, "uart", 0); -- cgit v1.2.3