Skip to content

Commit

Permalink
(nw) more cassette wave sound
Browse files Browse the repository at this point in the history
  • Loading branch information
Robbbert committed Jun 30, 2019
1 parent 49a3f61 commit 983cd20
Show file tree
Hide file tree
Showing 19 changed files with 42 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/mame/drivers/jupace.cpp
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/mame/drivers/kc.cpp
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down
5 changes: 5 additions & 0 deletions src/mame/drivers/kim1.cpp
Expand Up @@ -60,6 +60,8 @@ and the corresponding segments of an LED are illuminated.

#include "emu.h"
#include "includes/kim1.h"
#include "sound/wave.h"
#include "speaker.h"
#include "kim1.lh"

//**************************************************************************
Expand Down Expand Up @@ -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));

Expand Down
2 changes: 1 addition & 1 deletion src/mame/drivers/lviv.cpp
Expand Up @@ -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 */
Expand Down
2 changes: 2 additions & 0 deletions src/mame/drivers/m5.cpp
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions src/mame/drivers/mc10.cpp
Expand Up @@ -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"

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions src/mame/drivers/mc1000.cpp
Expand Up @@ -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"

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/mame/drivers/mc1502.cpp
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/mame/drivers/mekd2.cpp
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/mame/drivers/mikro80.cpp
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/mame/drivers/mikrosha.cpp
Expand Up @@ -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));
Expand Down
1 change: 1 addition & 0 deletions src/mame/drivers/mk14.cpp
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions src/mame/drivers/mkit09.cpp
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/mame/drivers/msx.cpp
Expand Up @@ -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));
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/mame/drivers/mz2000.cpp
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/mame/drivers/ondra.cpp
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/mame/drivers/oric.cpp
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/mame/drivers/orion.cpp
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down
13 changes: 10 additions & 3 deletions src/mame/drivers/pp01.cpp
Expand Up @@ -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 - ?
****************************************************************************/

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 983cd20

Please sign in to comment.