(MESS) cassette cleanup (nw)

This commit is contained in:
Miodrag Milanovic 2013-04-17 08:30:36 +00:00
parent 521b0c7c86
commit 5d8cdfb2e5
256 changed files with 710 additions and 796 deletions

1
.gitattributes vendored
View File

@ -6416,7 +6416,6 @@ src/mess/includes/busicom.h svneol=native#text/plain
src/mess/includes/bw12.h svneol=native#text/plain
src/mess/includes/bw2.h svneol=native#text/plain
src/mess/includes/c128.h svneol=native#text/plain
src/mess/includes/c16.h svneol=native#text/plain
src/mess/includes/c64.h svneol=native#text/plain
src/mess/includes/c65.h svneol=native#text/plain
src/mess/includes/c80.h svneol=native#text/plain

View File

@ -124,9 +124,6 @@ typedef device_type_iterator<&device_creator<cassette_image_device>, cassette_im
/***************************************************************************
DEVICE CONFIGURATION MACROS
***************************************************************************/
#define CASSETTE_TAG "cassette"
#define CASSETTE2_TAG "cassette2"
#define MCFG_CASSETTE_ADD(_tag, _config) \
MCFG_DEVICE_ADD(_tag, CASSETTE, 0) \
MCFG_DEVICE_CONFIG(_config)

View File

@ -54,7 +54,8 @@ public:
m_banking_mode(0xff),
m_joy1(*this, CONTROL1_TAG),
m_joy2(*this, CONTROL2_TAG) ,
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_cassette(*this, "cassette") { }
dpc_t m_dpc;
memory_region* m_extra_RAM;
@ -169,6 +170,7 @@ protected:
int detect_super_chip();
unsigned long detect_2600controllers();
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette;
};
@ -950,7 +952,7 @@ READ8_MEMBER(a2600_state::modeSS_r)
else if ( offset == 0xFF9 )
{
/* Cassette port read */
double tap_val = machine().device<cassette_image_device>(CASSETTE_TAG)->input();
double tap_val = m_cassette->input();
//logerror("%04X: Cassette port read, tap_val = %f\n", m_maincpu->pc(), tap_val);
if ( tap_val < 0 )
{
@ -1266,7 +1268,7 @@ WRITE8_MEMBER(a2600_state::switch_A_w)
// switch( ioport("CONTROLLERS")->read() % CATEGORY_SELECT )
// {
// case 0x0a: /* KidVid voice module */
// machine().device<cassette_image_device>(CASSETTE_TAG)->change_state(( data & 0x02 ) ? (cassette_state)CASSETTE_MOTOR_DISABLED : (cassette_state)(CASSETTE_MOTOR_ENABLED | CASSETTE_PLAY), (cassette_state)CASSETTE_MOTOR_DISABLED );
// m_cassette->change_state(( data & 0x02 ) ? (cassette_state)CASSETTE_MOTOR_DISABLED : (cassette_state)(CASSETTE_MOTOR_ENABLED | CASSETTE_PLAY), (cassette_state)CASSETTE_MOTOR_DISABLED );
// break;
// }
}
@ -1815,7 +1817,7 @@ void a2600_state::machine_reset()
m_modeSS_write_enabled = 0;
m_modeSS_byte_started = 0;
/* The Supercharger has no motor control so just enable it */
machine().device<cassette_image_device>(CASSETTE_TAG)->change_state(CASSETTE_MOTOR_ENABLED, CASSETTE_MOTOR_DISABLED );
m_cassette->change_state(CASSETTE_MOTOR_ENABLED, CASSETTE_MOTOR_DISABLED );
break;
case modeFV:
@ -1945,7 +1947,7 @@ static MACHINE_CONFIG_START( a2600, a2600_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_TIA_ADD("tia", MASTER_CLOCK_NTSC/114)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
@ -1956,7 +1958,7 @@ static MACHINE_CONFIG_START( a2600, a2600_state )
MCFG_FRAGMENT_ADD(a2600_cartslot)
MCFG_SOFTWARE_LIST_FILTER("cart_list", "NTSC")
MCFG_CASSETTE_ADD( CASSETTE_TAG, a2600_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", a2600_cassette_interface )
MACHINE_CONFIG_END
@ -1982,7 +1984,7 @@ static MACHINE_CONFIG_START( a2600p, a2600_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_TIA_ADD("tia", MASTER_CLOCK_PAL/114)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
@ -1993,7 +1995,7 @@ static MACHINE_CONFIG_START( a2600p, a2600_state )
MCFG_FRAGMENT_ADD(a2600_cartslot)
MCFG_SOFTWARE_LIST_FILTER("cart_list", "PAL")
MCFG_CASSETTE_ADD( CASSETTE_TAG, a2600_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", a2600_cassette_interface )
MACHINE_CONFIG_END

View File

@ -39,7 +39,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_hgdc(*this, "upd7220"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_beep(*this, BEEPER_TAG),
m_fdc(*this, "upd765a"),
m_floppy0(*this, "upd765a:0"),
@ -599,7 +599,7 @@ static MACHINE_CONFIG_START( a5105, a5105_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@ -609,7 +609,7 @@ static MACHINE_CONFIG_START( a5105, a5105_state )
MCFG_Z80CTC_ADD( "z80ctc", XTAL_15MHz / 4, a5105_ctc_intf )
MCFG_Z80PIO_ADD( "z80pio", XTAL_15MHz / 4, a5105_pio_intf )
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MCFG_UPD765A_ADD("upd765a", true, true)
MCFG_FLOPPY_DRIVE_ADD("upd765a:0", a5105_floppies, "525qd", 0, a5105_state::floppy_formats)

View File

@ -618,7 +618,7 @@ static MACHINE_CONFIG_START( abc80, abc80_state )
// devices
MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_11_9808MHz/2/2, pio_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, abc80_cassette_interface)
MCFG_CASSETTE_ADD("cassette", abc80_cassette_interface)
MCFG_ABC80_KEYBOARD_ADD(kb_intf)
MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_intf, abcbus_cards, "slow", abc830_slow)
MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL)

View File

@ -1208,7 +1208,7 @@ static MACHINE_CONFIG_START( abc800c, abc800c_state )
MCFG_Z80CTC_ADD(Z80CTC_TAG, ABC800_X01/2/2, ctc_intf)
MCFG_Z80SIO2_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf)
MCFG_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc800_dart_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, cass_intf)
MCFG_CASSETTE_ADD("cassette", cass_intf)
MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL)
MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL)
MCFG_ABC800_KEYBOARD_ADD(abc800_kb_intf)
@ -1250,7 +1250,7 @@ static MACHINE_CONFIG_START( abc800m, abc800m_state )
MCFG_Z80CTC_ADD(Z80CTC_TAG, ABC800_X01/2/2, ctc_intf)
MCFG_Z80SIO2_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf)
MCFG_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc800_dart_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, cass_intf)
MCFG_CASSETTE_ADD("cassette", cass_intf)
MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL)
MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL)
MCFG_ABC800_KEYBOARD_ADD(abc800_kb_intf)
@ -1292,7 +1292,7 @@ static MACHINE_CONFIG_START( abc802, abc802_state )
MCFG_Z80CTC_ADD(Z80CTC_TAG, ABC800_X01/2/2, ctc_intf)
MCFG_Z80SIO2_ADD(Z80SIO_TAG, ABC800_X01/2/2, sio_intf)
MCFG_Z80DART_ADD(Z80DART_TAG, ABC800_X01/2/2, abc802_dart_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, cass_intf)
MCFG_CASSETTE_ADD("cassette", cass_intf)
MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232a_intf, default_rs232_devices, NULL, NULL)
MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL, NULL)
MCFG_ABC55_ADD(kb_intf)

View File

@ -143,10 +143,10 @@ static MACHINE_CONFIG_START( ac1, ac1_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ac1_32, ac1 )

View File

@ -750,7 +750,7 @@ static MACHINE_CONFIG_START( ace, ace_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@ -764,7 +764,7 @@ static MACHINE_CONFIG_START( ace, ace_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_CASSETTE_ADD(CASSETTE_TAG, ace_cassette_interface)
MCFG_CASSETTE_ADD("cassette", ace_cassette_interface)
MCFG_SNAPSHOT_ADD("snapshot", ace, "ace", 1)
MCFG_I8255A_ADD(I8255_TAG, ppi_intf)
MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_6_5MHz/2, pio_intf)

View File

@ -272,7 +272,7 @@ static MACHINE_CONFIG_START( aim65, aim65_state )
/* Sound - wave sound only */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* other devices */
@ -281,8 +281,8 @@ static MACHINE_CONFIG_START( aim65, aim65_state )
MCFG_VIA6522_ADD("via6522_1", 0, aim65_user_via)
MCFG_PIA6821_ADD("pia6821", aim65_pia_config)
MCFG_CASSETTE_ADD( CASSETTE_TAG, aim65_1_cassette_interface )
MCFG_CASSETTE_ADD( CASSETTE2_TAG, aim65_2_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", aim65_1_cassette_interface )
MCFG_CASSETTE_ADD( "cassette2", aim65_2_cassette_interface )
MCFG_CARTSLOT_ADD("cart1")
MCFG_CARTSLOT_EXTENSION_LIST("z26")

View File

@ -267,7 +267,7 @@ static MACHINE_CONFIG_START( hr16, alesis_state )
MCFG_PALETTE_LENGTH(2)
MCFG_CASSETTE_ADD( CASSETTE_TAG, hr16_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", hr16_cassette_interface )
MCFG_HD44780_ADD("hd44780")
MCFG_HD44780_LCD_SIZE(2, 16)

View File

@ -39,7 +39,7 @@ public:
m_maincpu(*this, "maincpu"),
m_crtc(*this, "crtc"),
m_usart(*this, "usart"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_beep(*this, BEEPER_TAG),
m_p_ram(*this, "p_ram"),
m_p_videoram(*this, "p_videoram"){ }
@ -439,7 +439,7 @@ static MACHINE_CONFIG_START( alphatro, alphatro_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@ -448,7 +448,7 @@ static MACHINE_CONFIG_START( alphatro, alphatro_state )
MCFG_I8251_ADD("usart", alphatro_usart_interface)
MCFG_CASSETTE_ADD(CASSETTE_TAG, alphatro_cassette_interface)
MCFG_CASSETTE_ADD("cassette", alphatro_cassette_interface)
MCFG_RAM_ADD("ram")
MCFG_RAM_DEFAULT_SIZE("64K")

View File

@ -862,7 +862,7 @@ static MACHINE_CONFIG_START( amstrad_nofdc, amstrad_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ay", AY8912, XTAL_16MHz / 16)
MCFG_SOUND_CONFIG(ay8912_interface)
@ -874,7 +874,7 @@ static MACHINE_CONFIG_START( amstrad_nofdc, amstrad_state )
/* snapshot */
MCFG_SNAPSHOT_ADD("snapshot", amstrad, "sna", 0)
MCFG_CASSETTE_ADD( CASSETTE_TAG, amstrad_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", amstrad_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","cpc_cass")
MCFG_CPC_EXPANSION_SLOT_ADD("exp",cpc_exp_intf,cpc_exp_cards,NULL,NULL)
@ -936,7 +936,7 @@ static MACHINE_CONFIG_START( cpcplus, amstrad_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ay", AY8912, XTAL_40MHz / 40)
MCFG_SOUND_CONFIG(ay8912_interface)
@ -948,7 +948,7 @@ static MACHINE_CONFIG_START( cpcplus, amstrad_state )
/* snapshot */
MCFG_SNAPSHOT_ADD("snapshot", amstrad, "sna", 0)
MCFG_CASSETTE_ADD( CASSETTE_TAG, amstrad_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", amstrad_cassette_interface )
MCFG_UPD765A_ADD("upd765", true, true)

View File

@ -72,7 +72,7 @@ public:
m_speaker(*this, "speaker"),
m_pia0(*this, "pia_0"),
m_pia1(*this, "pia_1"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_fdc(*this, "wd179x")
,
m_p_videoram(*this, "p_videoram"){ }
@ -703,7 +703,7 @@ static MACHINE_CONFIG_START( apf_imagination, apf_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
//MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
//MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
//MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@ -711,7 +711,7 @@ static MACHINE_CONFIG_START( apf_imagination, apf_state )
/* Devices */
MCFG_PIA6821_ADD( "pia_0", apf_m1000_pia_interface )
MCFG_PIA6821_ADD( "pia_1", apf_imagination_pia_interface )
MCFG_CASSETTE_ADD( CASSETTE_TAG, apf_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", apf_cassette_interface )
MCFG_FD1793_ADD("wd179x", default_wd17xx_interface ) // TODO confirm type
MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(apfimag_floppy_interface)
MACHINE_CONFIG_END
@ -723,7 +723,7 @@ static MACHINE_CONFIG_DERIVED( apf_m1000, apf_imagination )
MCFG_DEVICE_REMOVE( "pia_1" )
// MCFG_DEVICE_REMOVE( WAVE_TAG )
MCFG_DEVICE_REMOVE( CASSETTE_TAG )
MCFG_DEVICE_REMOVE( "cassette" )
MCFG_LEGACY_FLOPPY_2_DRIVES_REMOVE()
MCFG_CARTSLOT_ADD("cart")

View File

@ -185,12 +185,12 @@ static MACHINE_CONFIG_START( apogee, apogee_state )
MCFG_PALETTE_INIT_OVERRIDE(apogee_state,radio86)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_I8257_ADD("dma8257", XTAL_16MHz / 9, radio86_dma)
MCFG_CASSETTE_ADD( CASSETTE_TAG, apogee_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", apogee_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","apogee")
MACHINE_CONFIG_END

View File

@ -310,7 +310,7 @@ static MACHINE_CONFIG_START( apple1, apple1_state )
/* snapshot */
MCFG_SNAPSHOT_ADD("snapshot", apple1, "snp", 0)
MCFG_CASSETTE_ADD(CASSETTE_TAG, apple1_cassette_interface)
MCFG_CASSETTE_ADD("cassette", apple1_cassette_interface)
MCFG_SOFTWARE_LIST_ADD("cass_list","apple1")
/* Note that because we always include 4K of RAM at $E000-$EFFF,

View File

@ -697,7 +697,7 @@ static MACHINE_CONFIG_DERIVED( apple2, apple2_common )
/* At the moment the RAM bank $C000-$FFFF is available only if you choose */
/* default configuration: on real machine is present also in configurations */
/* with less memory, provided that the language card is installed */
MCFG_CASSETTE_ADD( CASSETTE_TAG, apple2_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", apple2_cassette_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( apple2p, apple2_common )
@ -712,7 +712,7 @@ static MACHINE_CONFIG_DERIVED( apple2p, apple2_common )
/* At the moment the RAM bank $C000-$FFFF is available only if you choose */
/* default configuration: on real machine is present also in configurations */
/* with less memory, provided that the language card is installed */
MCFG_CASSETTE_ADD( CASSETTE_TAG, apple2_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", apple2_cassette_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( apple2e, apple2_common )
@ -723,7 +723,7 @@ static MACHINE_CONFIG_DERIVED( apple2e, apple2_common )
MCFG_RAM_DEFAULT_SIZE("128K")
MCFG_RAM_EXTRA_OPTIONS("64K")
MCFG_RAM_DEFAULT_VALUE(0x00)
MCFG_CASSETTE_ADD( CASSETTE_TAG, apple2_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", apple2_cassette_interface )
// IIe and later have no physical slot 0, the "language card" is built into the motherboard
MCFG_A2BUS_SLOT_REMOVE("sl0")
@ -741,7 +741,7 @@ static MACHINE_CONFIG_DERIVED( tk2000, apple2_common )
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
MCFG_RAM_DEFAULT_VALUE(0x00)
MCFG_CASSETTE_ADD( CASSETTE_TAG, apple2_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", apple2_cassette_interface )
// TK2000 doesn't have slots, and it doesn't emulate a language card
// C05A maps RAM from C100-FFFF, C05B maps ROM

View File

@ -385,7 +385,7 @@ static MACHINE_CONFIG_START( aquarius, aquarius_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, aquarius_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", aquarius_cassette_interface )
/* cartridge */
MCFG_CARTSLOT_ADD("cart")

View File

@ -876,7 +876,7 @@ static MACHINE_CONFIG_START( atom, atom_state )
MCFG_I8271_ADD(I8271_TAG, fdc_intf)
MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(atom_floppy_interface)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, atom_centronics_config)
MCFG_CASSETTE_ADD(CASSETTE_TAG, atom_cassette_interface)
MCFG_CASSETTE_ADD("cassette", atom_cassette_interface)
MCFG_QUICKLOAD_ADD("quickload", atom_atm, "atm", 0)
/* cartridge */
@ -945,7 +945,7 @@ static MACHINE_CONFIG_START( atombb, atom_state )
MCFG_VIA6522_ADD(R6522_TAG, X2/4, via_intf)
MCFG_I8255_ADD(INS8255_TAG, ppi_intf)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, atom_centronics_config)
MCFG_CASSETTE_ADD(CASSETTE_TAG, atom_cassette_interface)
MCFG_CASSETTE_ADD("cassette", atom_cassette_interface)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

View File

@ -871,7 +871,7 @@ static MACHINE_CONFIG_START( bbca, bbc_state )
// MCFG_SOUND_ADD("tms5220", TMS5220, tms5220_interface)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, bbc_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", bbc_cassette_interface )
/* software list */
MCFG_SOFTWARE_LIST_ADD("cass_ls_a","bbca_cass")
@ -969,7 +969,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state )
MCFG_CENTRONICS_PRINTER_ADD("centronics", bbcb_centronics_config)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, bbc_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", bbc_cassette_interface )
/* software list */
MCFG_SOFTWARE_LIST_ADD("cass_ls_m","bbcm_cass")

View File

@ -62,7 +62,7 @@ public:
binbug_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_keyboard(*this, KEYBOARD_TAG),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_p_videoram(*this, "videoram"),
m_p_attribram(*this, "attribram") ,
m_maincpu(*this, "maincpu") { }
@ -308,9 +308,9 @@ static MACHINE_CONFIG_START( binbug, binbug_state )
MCFG_SERIAL_KEYBOARD_ADD(KEYBOARD_TAG, keyboard_intf, 300)
/* Cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* quickload */
@ -568,9 +568,9 @@ static MACHINE_CONFIG_START( dg680, dg680_state )
MCFG_ASCII_KEYBOARD_ADD("keyb", dg680_keyboard_intf)
/* Cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* Devices */

View File

@ -190,10 +190,10 @@ static MACHINE_CONFIG_START( bk0010, bk_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, bk0010_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", bk0010_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","bk0010")
MACHINE_CONFIG_END

View File

@ -25,7 +25,7 @@ public:
bmjr_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_beep(*this, BEEPER_TAG)
,
m_p_wram(*this, "p_wram"){ }
@ -364,11 +364,11 @@ static MACHINE_CONFIG_START( bmjr, bmjr_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* Devices */
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MACHINE_CONFIG_END
/* ROM definition */

View File

@ -48,7 +48,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_crtc(*this, "crtc"),
//m_cass(*this, CASSETTE_TAG),
//m_cass(*this, "cassette"),
m_beep(*this, BEEPER_TAG)
{ }

View File

@ -19,7 +19,7 @@ public:
bob85_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_line0(*this, "LINE0"),
m_line1(*this, "LINE1"),
m_line2(*this, "LINE2") { }
@ -213,7 +213,7 @@ static MACHINE_CONFIG_START( bob85, bob85_state )
MCFG_DEFAULT_LAYOUT(layout_bob85)
// devices
MCFG_CASSETTE_ADD(CASSETTE_TAG, bob85_cassette_interface)
MCFG_CASSETTE_ADD("cassette", bob85_cassette_interface)
MACHINE_CONFIG_END
/* ROM definition */

View File

@ -252,7 +252,7 @@ static MACHINE_CONFIG_START( c80, c80_state )
/* devices */
MCFG_Z80PIO_ADD(Z80PIO1_TAG, 2500000, pio1_intf)
MCFG_Z80PIO_ADD(Z80PIO2_TAG, 2500000, pio2_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, c80_cassette_interface)
MCFG_CASSETTE_ADD("cassette", c80_cassette_interface)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

View File

@ -87,7 +87,7 @@ public:
camplynx_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
//m_cass(*this, CASSETTE_TAG),
//m_cass(*this, "cassette"),
//m_wave(*this, WAVE_TAG),
//m_printer(*this, "centronics"),
m_crtc(*this, "crtc")

View File

@ -38,7 +38,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_p_videoram(*this, "p_videoram"),
m_cass(*this, CASSETTE_TAG) { }
m_cass(*this, "cassette") { }
DECLARE_READ8_MEMBER(cd2650_keyin_r);
DECLARE_WRITE8_MEMBER(kbd_put);
@ -270,9 +270,9 @@ static MACHINE_CONFIG_START( cd2650, cd2650_state )
MCFG_QUICKLOAD_ADD("quickload", cd2650, "pgm", 1)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END

View File

@ -549,7 +549,7 @@ static MACHINE_CONFIG_START( cgenie_common, cgenie_state )
MCFG_SOUND_CONFIG(cgenie_ay8910_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_CASSETTE_ADD( CASSETTE_TAG, cgenie_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", cgenie_cassette_interface )
MCFG_FD1793_ADD("wd179x", cgenie_wd17xx_interface ) // TODO confirm type

View File

@ -256,7 +256,7 @@ MACHINE_CONFIG_FRAGMENT( coco_sound )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(DAC_TAG, DAC, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@ -275,7 +275,7 @@ static MACHINE_CONFIG_START( coco, coco12_state )
MCFG_PIA6821_ADD(PIA0_TAG, coco_state::pia0_config)
MCFG_PIA6821_ADD(PIA1_TAG, coco_state::pia1_config)
MCFG_SAM6883_ADD(SAM_TAG, XTAL_3_579545MHz, coco12_state::sam6883_config)
MCFG_CASSETTE_ADD(CASSETTE_TAG, coco_state::coco_cassette_interface)
MCFG_CASSETTE_ADD("cassette", coco_state::coco_cassette_interface)
MCFG_BITBANGER_ADD(BITBANGER_TAG, coco_state::coco_bitbanger_config)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_state::cartridge_config, coco_cart, "pak", NULL)

View File

@ -251,7 +251,7 @@ static MACHINE_CONFIG_START( coco3, coco3_state )
// devices
MCFG_PIA6821_ADD(PIA0_TAG, coco_state::pia0_config)
MCFG_PIA6821_ADD(PIA1_TAG, coco_state::pia1_config)
MCFG_CASSETTE_ADD(CASSETTE_TAG, coco_state::coco_cassette_interface)
MCFG_CASSETTE_ADD("cassette", coco_state::coco_cassette_interface)
MCFG_BITBANGER_ADD(BITBANGER_TAG, coco_state::coco_bitbanger_config)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_state::cartridge_config, coco_cart, "fdcv11", NULL)
MCFG_COCO_VHD_ADD(VHD0_TAG)

View File

@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( pal, comx35_state )
// peripheral hardware
MCFG_CDP1871_ADD(CDP1871_TAG, kbc_intf, CDP1869_CPU_CLK_PAL / 8)
MCFG_QUICKLOAD_ADD("quickload", comx35_comx, "comx", 0)
MCFG_CASSETTE_ADD(CASSETTE_TAG, cassette_intf)
MCFG_CASSETTE_ADD("cassette", cassette_intf)
// expansion bus
MCFG_COMX_EXPANSION_SLOT_ADD(EXPANSION_TAG, expansion_intf, comx_expansion_cards, "eb", NULL)
@ -723,7 +723,7 @@ static MACHINE_CONFIG_START( ntsc, comx35_state )
// peripheral hardware
MCFG_CDP1871_ADD(CDP1871_TAG, kbc_intf, CDP1869_CPU_CLK_NTSC / 8)
MCFG_QUICKLOAD_ADD("quickload", comx35_comx, "comx", 0)
MCFG_CASSETTE_ADD(CASSETTE_TAG, cassette_intf)
MCFG_CASSETTE_ADD("cassette", cassette_intf)
// expansion bus
MCFG_COMX_EXPANSION_SLOT_ADD(EXPANSION_TAG, expansion_intf, comx_expansion_cards, "eb", NULL)

View File

@ -588,7 +588,7 @@ static MACHINE_CONFIG_START( cosmicos, cosmicos_state )
/* devices */
MCFG_QUICKLOAD_ADD("quickload", cosmicos, "bin", 0)
MCFG_CASSETTE_ADD(CASSETTE_TAG, cosmicos_cassette_interface)
MCFG_CASSETTE_ADD("cassette", cosmicos_cassette_interface)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

View File

@ -952,7 +952,7 @@ static MACHINE_CONFIG_START( creativision, crvision_state )
// devices
MCFG_PIA6821_ADD(PIA6821_TAG, pia_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, crvision_cassette_interface)
MCFG_CASSETTE_ADD("cassette", crvision_cassette_interface)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
// sound hardware
@ -961,7 +961,7 @@ static MACHINE_CONFIG_START( creativision, crvision_state )
MCFG_SOUND_CONFIG(psg_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(1, "mono", 0.25)
// cartridge
@ -1013,7 +1013,7 @@ static MACHINE_CONFIG_START( lasr2001, laser2001_state )
// devices
MCFG_PIA6821_ADD(PIA6821_TAG, lasr2001_pia_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, lasr2001_cassette_interface)
MCFG_CASSETTE_ADD("cassette", lasr2001_cassette_interface)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, lasr2001_centronics_intf)
// video hardware
@ -1027,7 +1027,7 @@ static MACHINE_CONFIG_START( lasr2001, laser2001_state )
MCFG_SOUND_CONFIG(psg_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(1, "mono", 0.25)
// cartridge

View File

@ -53,7 +53,7 @@ public:
d6800_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_pia(*this, "pia"),
m_dac(*this, "dac"),
m_videoram(*this, "videoram"),
@ -390,14 +390,14 @@ static MACHINE_CONFIG_START( d6800, d6800_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("dac", DAC, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
MCFG_PIA6821_ADD("pia", d6800_mc6821_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, d6800_cassette_interface)
MCFG_CASSETTE_ADD("cassette", d6800_cassette_interface)
MCFG_TIMER_DRIVER_ADD_PERIODIC("d6800_p", d6800_state, d6800_p, attotime::from_hz(40000))
/* quickload */

View File

@ -221,7 +221,7 @@ static MACHINE_CONFIG_START( dai, dai_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("custom", DAI_SOUND, 0)
@ -229,7 +229,7 @@ static MACHINE_CONFIG_START( dai, dai_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, dai_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", dai_cassette_interface )
/* tms5501 */
MCFG_TMS5501_ADD( "tms5501", 2000000, dai_tms5501_interface )

View File

@ -144,7 +144,7 @@ static MACHINE_CONFIG_START( dragon_base, dragon_state )
MCFG_PIA6821_ADD(PIA0_TAG, dragon_state::pia0_config)
MCFG_PIA6821_ADD(PIA1_TAG, dragon_state::pia1_config)
MCFG_SAM6883_ADD(SAM_TAG, XTAL_4_433619MHz, dragon_state::sam6883_config)
MCFG_CASSETTE_ADD(CASSETTE_TAG, dragon_state::coco_cassette_interface)
MCFG_CASSETTE_ADD("cassette", dragon_state::coco_cassette_interface)
MCFG_PRINTER_ADD(PRINTER_TAG)
// video hardware

View File

@ -195,7 +195,7 @@ static MACHINE_CONFIG_START( electron, electron_state )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_CASSETTE_ADD( CASSETTE_TAG, electron_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", electron_cassette_interface )
MACHINE_CONFIG_END

View File

@ -313,7 +313,7 @@ static MACHINE_CONFIG_START( elf2, elf2_state )
MCFG_CDP1861_ADD(CDP1861_TAG, XTAL_3_579545MHz/2, elf2_cdp1861_intf)
/* devices */
MCFG_CASSETTE_ADD(CASSETTE_TAG, elf_cassette_interface)
MCFG_CASSETTE_ADD("cassette", elf_cassette_interface)
MCFG_QUICKLOAD_ADD("quickload", elf, "bin", 0)
/* internal ram */

View File

@ -588,12 +588,12 @@ static MACHINE_CONFIG_START( elwro800, elwro800_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_CASSETTE_ADD( CASSETTE_TAG, elwro800jr_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", elwro800jr_cassette_interface )
MCFG_FLOPPY_DRIVE_ADD("upd765:0", elwro800jr_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", elwro800jr_floppies, "525hd", 0, floppy_image_device::default_floppy_formats)

View File

@ -267,7 +267,7 @@ static MACHINE_CONFIG_START( eti660, eti660_state )
/* devices */
MCFG_PIA6821_ADD(MC6821_TAG, eti660_mc6821_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, eti660_cassette_interface)
MCFG_CASSETTE_ADD("cassette", eti660_cassette_interface)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

View File

@ -226,7 +226,7 @@ static MACHINE_CONFIG_START( exp85, exp85_state )
/* devices */
MCFG_I8155_ADD(I8155_TAG, XTAL_6_144MHz/2, i8155_intf)
MCFG_I8355_ADD(I8355_TAG, XTAL_6_144MHz/2, i8355_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, exp85_cassette_interface)
MCFG_CASSETTE_ADD("cassette", exp85_cassette_interface)
MCFG_SERIAL_TERMINAL_ADD(TERMINAL_TAG, terminal_intf,9600)
/* internal ram */

View File

@ -729,7 +729,7 @@ READ8_MEMBER(fm7_state::fm7_cassette_printer_r)
// bit 1: printer error
// bit 0: printer busy
UINT8 ret = 0x00;
double data = (machine().device<cassette_image_device>(CASSETTE_TAG)->input());
double data = m_cassette->input();
centronics_device* centronics = machine().device<centronics_device>("lpt");
UINT8 pdata;
int x;
@ -737,7 +737,7 @@ READ8_MEMBER(fm7_state::fm7_cassette_printer_r)
if(data > 0.03)
ret |= 0x80;
if(machine().device<cassette_image_device>(CASSETTE_TAG)->get_state() & CASSETTE_MOTOR_DISABLED)
if(m_cassette->get_state() & CASSETTE_MOTOR_DISABLED)
ret |= 0x80; // cassette input is high when not in use.
ret |= 0x70;
@ -784,9 +784,9 @@ WRITE8_MEMBER(fm7_state::fm7_cassette_printer_w)
// bit 1: cassette motor
// bit 0: cassette output
if((data & 0x01) != (m_cp_prev & 0x01))
machine().device<cassette_image_device>(CASSETTE_TAG)->output((data & 0x01) ? +1.0 : -1.0);
m_cassette->output((data & 0x01) ? +1.0 : -1.0);
if((data & 0x02) != (m_cp_prev & 0x02))
machine().device<cassette_image_device>(CASSETTE_TAG)->change_state((data & 0x02) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR);
m_cassette->change_state((data & 0x02) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR);
centronics->strobe_w(!(data & 0x40));
m_cp_prev = data;
break;
@ -2035,7 +2035,7 @@ static MACHINE_CONFIG_START( fm7, fm7_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 1.00)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.25)
MCFG_MACHINE_START_OVERRIDE(fm7_state,fm7)
@ -2052,7 +2052,7 @@ static MACHINE_CONFIG_START( fm7, fm7_state )
MCFG_PALETTE_LENGTH(8)
MCFG_CASSETTE_ADD(CASSETTE_TAG, fm7_cassette_interface)
MCFG_CASSETTE_ADD("cassette", fm7_cassette_interface)
MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface)
@ -2077,7 +2077,7 @@ static MACHINE_CONFIG_START( fm8, fm7_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
MCFG_MACHINE_START_OVERRIDE(fm7_state,fm7)
@ -2094,7 +2094,7 @@ static MACHINE_CONFIG_START( fm8, fm7_state )
MCFG_PALETTE_LENGTH(8)
MCFG_CASSETTE_ADD(CASSETTE_TAG, fm7_cassette_interface)
MCFG_CASSETTE_ADD("cassette", fm7_cassette_interface)
MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface)
@ -2120,7 +2120,7 @@ static MACHINE_CONFIG_START( fm77av, fm7_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",1.0)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
MCFG_MACHINE_START_OVERRIDE(fm7_state,fm77av)
@ -2136,7 +2136,7 @@ static MACHINE_CONFIG_START( fm77av, fm7_state )
MCFG_PALETTE_LENGTH(8 + 4096)
MCFG_CASSETTE_ADD(CASSETTE_TAG, fm7_cassette_interface)
MCFG_CASSETTE_ADD("cassette", fm7_cassette_interface)
MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface)
@ -2166,7 +2166,7 @@ static MACHINE_CONFIG_START( fm11, fm7_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
MCFG_MACHINE_START_OVERRIDE(fm7_state,fm11)
@ -2183,7 +2183,7 @@ static MACHINE_CONFIG_START( fm11, fm7_state )
MCFG_PALETTE_LENGTH(8)
MCFG_CASSETTE_ADD(CASSETTE_TAG, fm7_cassette_interface)
MCFG_CASSETTE_ADD("cassette", fm7_cassette_interface)
MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface)
@ -2207,7 +2207,7 @@ static MACHINE_CONFIG_START( fm16beta, fm7_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
MCFG_MACHINE_START_OVERRIDE(fm7_state,fm16)
@ -2224,7 +2224,7 @@ static MACHINE_CONFIG_START( fm16beta, fm7_state )
MCFG_PALETTE_LENGTH(8)
MCFG_CASSETTE_ADD(CASSETTE_TAG, fm7_cassette_interface)
MCFG_CASSETTE_ADD("cassette", fm7_cassette_interface)
MCFG_MB8877_ADD("fdc",fm7_mb8877a_interface)

View File

@ -65,7 +65,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_subcpu(*this, "sub"),
//m_cass(*this, CASSETTE_TAG),
//m_cass(*this, "cassette"),
//m_wave(*this, WAVE_TAG),
//m_speaker(*this, "speaker"),
//m_printer(*this, "centronics"),

View File

@ -207,10 +207,10 @@ static MACHINE_CONFIG_START( galaxy, galaxy_state )
MCFG_SNAPSHOT_ADD("snapshot", galaxy, "gal", 0)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, galaxy_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", galaxy_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","galaxy")
/* internal ram */
@ -246,10 +246,10 @@ static MACHINE_CONFIG_START( galaxyp, galaxy_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ay8910", AY8910, XTAL/4)
MCFG_SOUND_CONFIG(galaxy_ay_interface)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, galaxy_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", galaxy_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","galaxy")
/* internal ram */

View File

@ -27,7 +27,7 @@ public:
h8_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
//m_cass(*this, CASSETTE_TAG),
//m_cass(*this, "cassette"),
m_beep(*this, BEEPER_TAG)
{ }

View File

@ -452,7 +452,7 @@ static MACHINE_CONFIG_START( hec2hr, hec2hrp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ADD("sn76477", SN76477, 0)
@ -464,7 +464,7 @@ static MACHINE_CONFIG_START( hec2hr, hec2hrp_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* Gestion cassette*/
MCFG_CASSETTE_ADD( CASSETTE_TAG, hector_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", hector_cassette_interface )
/* printer */
MCFG_PRINTER_ADD("printer")
@ -495,7 +495,7 @@ static MACHINE_CONFIG_START( hec2hrp, hec2hrp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(0, "mono", 0.25)// Sound level for cassette, as it is in mono => output channel=0
MCFG_SOUND_ADD("sn76477", SN76477, 0)
@ -507,7 +507,7 @@ static MACHINE_CONFIG_START( hec2hrp, hec2hrp_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* Gestion cassette*/
MCFG_CASSETTE_ADD( CASSETTE_TAG, hector_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", hector_cassette_interface )
/* printer */
MCFG_PRINTER_ADD("printer")
@ -550,7 +550,7 @@ static MACHINE_CONFIG_START( hec2mx40, hec2hrp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(0, "mono", 0.25)// Sound level for cassette, as it is in mono => output channel=0
MCFG_SOUND_ADD("sn76477", SN76477, 0)
@ -562,7 +562,7 @@ static MACHINE_CONFIG_START( hec2mx40, hec2hrp_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* Gestion cassette*/
MCFG_CASSETTE_ADD( CASSETTE_TAG, hector_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", hector_cassette_interface )
/* printer */
MCFG_PRINTER_ADD("printer")
@ -600,7 +600,7 @@ static MACHINE_CONFIG_START( hec2hrx, hec2hrp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(0, "mono", 0.25)// Sound level for cassette, as it is in mono => output channel=0
MCFG_SOUND_ADD("sn76477", SN76477, 0)
@ -612,7 +612,7 @@ static MACHINE_CONFIG_START( hec2hrx, hec2hrp_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// Gestion cassette
MCFG_CASSETTE_ADD( CASSETTE_TAG, hector_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", hector_cassette_interface )
/* printer */
MCFG_PRINTER_ADD("printer")
@ -648,7 +648,7 @@ static MACHINE_CONFIG_START( hec2mdhrx, hec2hrp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(0, "mono", 0.25)// Sound level for cassette, as it is in mono => output channel=0
MCFG_SOUND_ADD("sn76477", SN76477, 0)
@ -660,7 +660,7 @@ static MACHINE_CONFIG_START( hec2mdhrx, hec2hrp_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// Gestion cassette
MCFG_CASSETTE_ADD( CASSETTE_TAG, hector_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", hector_cassette_interface )
/* printer */
MCFG_PRINTER_ADD("printer")
@ -699,7 +699,7 @@ static MACHINE_CONFIG_START( hec2mx80, hec2hrp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(0, "mono", 0.25)// Sound level for cassette, as it is in mono => output channel=0
MCFG_SOUND_ADD("sn76477", SN76477, 0)
@ -711,7 +711,7 @@ static MACHINE_CONFIG_START( hec2mx80, hec2hrp_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* Gestion cassette*/
MCFG_CASSETTE_ADD( CASSETTE_TAG, hector_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", hector_cassette_interface )
/* printer */
MCFG_PRINTER_ADD("printer")

View File

@ -47,7 +47,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_speaker(*this, "speaker"),
m_cass(*this, CASSETTE_TAG)
m_cass(*this, "cassette")
{ }
DECLARE_READ8_MEMBER(key_r);
@ -756,10 +756,10 @@ static MACHINE_CONFIG_START( homelab, homelab_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MCFG_QUICKLOAD_ADD("quickload", homelab, "htp", 2)
MACHINE_CONFIG_END
@ -786,10 +786,10 @@ static MACHINE_CONFIG_START( homelab3, homelab_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MCFG_QUICKLOAD_ADD("quickload", homelab, "htp", 2)
MACHINE_CONFIG_END
@ -816,12 +816,12 @@ static MACHINE_CONFIG_START( brailab4, homelab_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD ( "speech", DAC, 0 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MCFG_MEA8000_ADD("mea8000", brailab4_speech_intf)
MCFG_QUICKLOAD_ADD("quickload", homelab, "htp", 18)
MACHINE_CONFIG_END

View File

@ -284,16 +284,12 @@ static Z80PIO_INTERFACE( pio2_intf )
READ_LINE_MEMBER(amu880_state::cassette_r)
{
device_t *device = machine().device(CASSETTE_TAG);
cassette_image_device* dev = dynamic_cast<cassette_image_device*>(device);
return dev->input() < 0.0;
return m_cassette->input() < 0.0;
}
WRITE_LINE_MEMBER(amu880_state::cassette_w)
{
device_t *device = machine().device(CASSETTE_TAG);
cassette_image_device* dev = dynamic_cast<cassette_image_device*>(device);
dev->output(state ? -1.0 : +1.0);
m_cassette->output(state ? -1.0 : +1.0);
}
static Z80DART_INTERFACE( sio_intf )
@ -410,7 +406,7 @@ static MACHINE_CONFIG_START( amu880, amu880_state )
MCFG_Z80PIO_ADD(Z80PIO2_TAG, XTAL_10MHz/4, pio2_intf)
MCFG_Z80SIO0_ADD(Z80SIO_TAG, XTAL_10MHz/4, sio_intf) // U856
MCFG_CASSETTE_ADD(CASSETTE_TAG, amu880_cassette_interface)
MCFG_CASSETTE_ADD("cassette", amu880_cassette_interface)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

View File

@ -60,7 +60,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_p_ram(*this, "p_ram"),
m_cass(*this, CASSETTE_TAG)
m_cass(*this, "cassette")
{ }
DECLARE_READ8_MEMBER(portfc_r);
@ -299,9 +299,9 @@ static MACHINE_CONFIG_START( instruct, instruct_state )
MCFG_QUICKLOAD_ADD("quickload", instruct, "pgm", 1)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END

View File

@ -161,7 +161,7 @@ static MACHINE_CONFIG_START( interact, interact_state )
MCFG_VIDEO_START_OVERRIDE(interact_state,hec2hrp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(0, "mono", 0.25) /* Sound level for cassette, as it is in mono => output channel=0*/
MCFG_SOUND_ADD("sn76477", SN76477, 0)
@ -172,7 +172,7 @@ static MACHINE_CONFIG_START( interact, interact_state )
MCFG_SOUND_CONFIG_DISCRETE( hec2hrp )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_CASSETTE_ADD( CASSETTE_TAG, interact_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", interact_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","interact")
/* printer */
@ -203,7 +203,7 @@ static MACHINE_CONFIG_START( hector1, interact_state )
MCFG_VIDEO_START_OVERRIDE(interact_state,hec2hrp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(0, "mono", 0.25)/* Sound level for cassette, as it is in mono => output channel=0*/
MCFG_SOUND_ADD("sn76477", SN76477, 0)
@ -214,7 +214,7 @@ static MACHINE_CONFIG_START( hector1, interact_state )
MCFG_SOUND_CONFIG_DISCRETE( hec2hrp )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_CASSETTE_ADD( CASSETTE_TAG, interact_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", interact_cassette_interface )
/* printer */
MCFG_PRINTER_ADD("printer")

View File

@ -864,7 +864,7 @@ static MACHINE_CONFIG_DERIVED( intvecs, intv )
MCFG_MACHINE_RESET_OVERRIDE(intv_state, intvecs )
/* cassette */
//MCFG_CASSETTE_ADD( CASSETTE_TAG, ecs_cassette_interface )
//MCFG_CASSETTE_ADD( "cassette", ecs_cassette_interface )
MACHINE_CONFIG_END

View File

@ -69,7 +69,7 @@ public:
m_maincpu(*this, "maincpu"),
m_pic(*this, "pic8259"),
m_speaker(*this, "speaker"),
m_cassette(*this, CASSETTE_TAG)
m_cassette(*this, "cassette")
{ }
required_device<cpu_device> m_maincpu;
@ -452,7 +452,7 @@ static MACHINE_CONFIG_START( iq151, iq151_state )
MCFG_I8255_ADD("ppi8255", iq151_ppi8255_intf)
MCFG_CASSETTE_ADD( CASSETTE_TAG, iq151_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", iq151_cassette_interface )
MCFG_TIMER_DRIVER_ADD_PERIODIC("cassette_timer", iq151_state, cassette_timer, attotime::from_hz(2000))
/* cartridge */

View File

@ -30,7 +30,7 @@ public:
m_pcg(*this, "pcg"),
m_vram(*this, "vram"),
m_via(*this, "via"),
m_cassette(*this, CASSETTE_TAG),
m_cassette(*this, "cassette"),
m_beeper(*this, BEEPER_TAG),
m_speaker(*this, "speaker"),
m_region_maincpu(*this, "maincpu"),
@ -407,7 +407,7 @@ static MACHINE_CONFIG_START( jr100, jr100_state )
MCFG_VIA6522_ADD("via", XTAL_14_31818MHz / 16, jr100_via_intf)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@ -415,7 +415,7 @@ static MACHINE_CONFIG_START( jr100, jr100_state )
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_CASSETTE_ADD( CASSETTE_TAG, jr100_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", jr100_cassette_interface )
MCFG_TIMER_DRIVER_ADD_PERIODIC("sound_tick", jr100_state, sound_tick, attotime::from_hz(XTAL_14_31818MHz / 16))

View File

@ -644,11 +644,11 @@ static MACHINE_CONFIG_START( basic, jtc_state )
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(1, "mono", 0.25)
/* cassette */
MCFG_CASSETTE_ADD(CASSETTE_TAG, jtc_cassette_interface)
MCFG_CASSETTE_ADD("cassette", jtc_cassette_interface)
/* printer */
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)

View File

@ -149,7 +149,7 @@ static MACHINE_CONFIG_START( kc85_3, kc_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@ -157,7 +157,7 @@ static MACHINE_CONFIG_START( kc85_3, kc_state )
/* devices */
MCFG_QUICKLOAD_ADD("quickload", kc, "kcc", 2)
MCFG_CASSETTE_ADD( CASSETTE_TAG, kc_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", kc_cassette_interface )
/* cartridge slot */
MCFG_KC85_CARTRIDGE_ADD("m8", "mc", kc85_exp_interface, kc85_cart, "m011", NULL)
@ -201,7 +201,7 @@ static MACHINE_CONFIG_START( kc85_4, kc85_4_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@ -209,7 +209,7 @@ static MACHINE_CONFIG_START( kc85_4, kc85_4_state )
/* devices */
MCFG_QUICKLOAD_ADD("quickload", kc, "kcc", 2)
MCFG_CASSETTE_ADD( CASSETTE_TAG, kc_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", kc_cassette_interface )
/* cartridge slot */
MCFG_KC85_CARTRIDGE_ADD("m8", "mc", kc85_exp_interface, kc85_cart, NULL, NULL)

View File

@ -109,7 +109,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_riot2(*this, "miot_u2"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_line0(*this, "LINE0"),
m_line1(*this, "LINE1"),
m_line2(*this, "LINE2"),
@ -358,7 +358,7 @@ static MACHINE_CONFIG_START( kim1, kim1_state )
/* Devices */
MCFG_MOS6530_ADD( "miot_u2", 1000000, kim1_u2_mos6530_interface )
MCFG_MOS6530_ADD( "miot_u3", 1000000, kim1_u3_mos6530_interface )
MCFG_CASSETTE_ADD( CASSETTE_TAG, kim1_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", kim1_cassette_interface )
MCFG_TIMER_DRIVER_ADD_PERIODIC("led_timer", kim1_state, kim1_update_leds, attotime::from_hz(60))
MCFG_TIMER_DRIVER_ADD_PERIODIC("cassette_timer", kim1_state, kim1_cassette_input, attotime::from_hz(44100))
MACHINE_CONFIG_END

View File

@ -1352,7 +1352,7 @@ static MACHINE_CONFIG_START( kc85, kc85_state )
MCFG_IM6402_ADD(IM6402_TAG, uart_intf)
MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_CASSETTE_ADD(CASSETTE_TAG, kc85_cassette_interface)
MCFG_CASSETTE_ADD("cassette", kc85_cassette_interface)
/* option ROM cartridge */
MCFG_CARTSLOT_ADD("cart")
@ -1390,7 +1390,7 @@ static MACHINE_CONFIG_START( pc8201, pc8201_state )
MCFG_IM6402_ADD(IM6402_TAG, uart_intf)
MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_CASSETTE_ADD(CASSETTE_TAG, kc85_cassette_interface)
MCFG_CASSETTE_ADD("cassette", kc85_cassette_interface)
/* option ROM cartridge */
MCFG_CARTSLOT_ADD("cart")
@ -1434,7 +1434,7 @@ static MACHINE_CONFIG_START( trsm100, trsm100_state )
MCFG_IM6402_ADD(IM6402_TAG, uart_intf)
MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_CASSETTE_ADD(CASSETTE_TAG, kc85_cassette_interface)
MCFG_CASSETTE_ADD("cassette", kc85_cassette_interface)
// MCFG_MC14412_ADD(MC14412_TAG, XTAL_1MHz)
/* option ROM cartridge */
@ -1484,7 +1484,7 @@ static MACHINE_CONFIG_START( tandy200, tandy200_state )
MCFG_RS232_PORT_ADD(RS232_TAG, rs232_intf, default_rs232_devices, NULL, NULL)
// MCFG_MC14412_ADD(MC14412_TAG, XTAL_1MHz)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_CASSETTE_ADD(CASSETTE_TAG, kc85_cassette_interface)
MCFG_CASSETTE_ADD("cassette", kc85_cassette_interface)
/* option ROM cartridge */
MCFG_CARTSLOT_ADD("cart")
@ -1523,7 +1523,7 @@ ROM_START( pc8201 )
ROM_REGION( 0x8000, "option", ROMREGION_ERASEFF )
ROM_CART_LOAD("cart1", 0x0000, 0x8000, ROM_MIRROR | ROM_OPTIONAL)
ROM_REGION( 0x20000, CASSETTE_TAG, ROMREGION_ERASEFF )
ROM_REGION( 0x20000, "cassette", ROMREGION_ERASEFF )
ROM_CART_LOAD("cart2", 0x0000, 0x20000, ROM_MIRROR | ROM_OPTIONAL)
ROM_END
@ -1534,7 +1534,7 @@ ROM_START( pc8201a )
ROM_REGION( 0x8000, "option", ROMREGION_ERASEFF )
ROM_CART_LOAD("cart", 0x0000, 0x8000, ROM_MIRROR | ROM_OPTIONAL)
ROM_REGION( 0x20000, CASSETTE_TAG, ROMREGION_ERASEFF )
ROM_REGION( 0x20000, "cassette", ROMREGION_ERASEFF )
ROM_CART_LOAD("cart2", 0x0000, 0x20000, ROM_MIRROR | ROM_OPTIONAL)
ROM_END
@ -1545,7 +1545,7 @@ ROM_START( npc8300 )
ROM_REGION( 0x8000, "option", ROMREGION_ERASEFF )
ROM_CART_LOAD("cart1", 0x0000, 0x8000, ROM_MIRROR | ROM_OPTIONAL)
ROM_REGION( 0x20000, CASSETTE_TAG, ROMREGION_ERASEFF )
ROM_REGION( 0x20000, "cassette", ROMREGION_ERASEFF )
ROM_CART_LOAD("cart2", 0x0000, 0x20000, ROM_MIRROR | ROM_OPTIONAL)
ROM_END

View File

@ -375,7 +375,7 @@ static MACHINE_CONFIG_START( lc80, lc80_state )
MCFG_Z80PIO_ADD(Z80PIO1_TAG, 900000, pio1_intf)
MCFG_Z80PIO_ADD(Z80PIO2_TAG, 900000, pio2_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, lc80_cassette_interface)
MCFG_CASSETTE_ADD("cassette", lc80_cassette_interface)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("1K")
@ -401,7 +401,7 @@ static MACHINE_CONFIG_START( lc80_2, lc80_state )
MCFG_Z80PIO_ADD(Z80PIO1_TAG, 900000, pio1_intf)
MCFG_Z80PIO_ADD(Z80PIO2_TAG, 900000, pio2_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, lc80_cassette_interface)
MCFG_CASSETTE_ADD("cassette", lc80_cassette_interface)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

View File

@ -452,7 +452,7 @@ static MACHINE_CONFIG_START( lviv, lviv_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@ -460,7 +460,7 @@ static MACHINE_CONFIG_START( lviv, lviv_state )
/* snapshot */
MCFG_SNAPSHOT_ADD("snapshot", lviv, "sav", 0)
MCFG_CASSETTE_ADD( CASSETTE_TAG, lviv_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", lviv_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","lviv")
/* internal ram */

View File

@ -658,7 +658,7 @@ static MACHINE_CONFIG_START( m5, m5_state )
// devices
MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_14_31818MHz/4, ctc_intf)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_CASSETTE_ADD(CASSETTE_TAG, cassette_intf)
MCFG_CASSETTE_ADD("cassette", cassette_intf)
MCFG_I8255_ADD(I8255A_TAG, ppi_intf)
MCFG_UPD765A_ADD(UPD765_TAG, true, true)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", m5_floppies, "525dd", 0, m5_state::floppy_formats)

View File

@ -701,7 +701,7 @@ static MACHINE_CONFIG_START( mbee, mbee_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@ -711,7 +711,7 @@ static MACHINE_CONFIG_START( mbee, mbee_state )
MCFG_QUICKLOAD_ADD("quickload", mbee, "mwb,com", 2)
MCFG_QUICKLOAD_ADD("quickload2", mbee_z80bin, "bin", 2)
MCFG_CENTRONICS_PRINTER_ADD("centronics", standard_centronics)
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MACHINE_CONFIG_END
@ -742,7 +742,7 @@ static MACHINE_CONFIG_START( mbeeic, mbee_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@ -752,7 +752,7 @@ static MACHINE_CONFIG_START( mbeeic, mbee_state )
MCFG_QUICKLOAD_ADD("quickload", mbee, "mwb,com", 2)
MCFG_QUICKLOAD_ADD("quickload2", mbee_z80bin, "bin", 2)
MCFG_CENTRONICS_PRINTER_ADD("centronics", standard_centronics)
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mbeepc, mbeeic )

View File

@ -43,7 +43,7 @@ public:
m_ef9345(*this, "ef9345"),
m_dac(*this, "dac"),
m_ram(*this, RAM_TAG),
m_cassette(*this, CASSETTE_TAG),
m_cassette(*this, "cassette"),
m_printer(*this, "printer")
{ }
@ -518,7 +518,7 @@ static MACHINE_CONFIG_START( mc10, mc10_state )
MCFG_SOUND_ADD("dac", DAC, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_CASSETTE_ADD(CASSETTE_TAG, mc10_cassette_interface)
MCFG_CASSETTE_ADD("cassette", mc10_cassette_interface)
/* printer */
MCFG_PRINTER_ADD("printer")
@ -557,7 +557,7 @@ static MACHINE_CONFIG_START( alice32, mc10_state )
MCFG_SOUND_ADD("dac", DAC, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_CASSETTE_ADD(CASSETTE_TAG, alice32_cassette_interface)
MCFG_CASSETTE_ADD("cassette", alice32_cassette_interface)
/* printer */
MCFG_PRINTER_ADD("printer")

View File

@ -460,7 +460,7 @@ static MACHINE_CONFIG_START( mc1000, mc1000_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_CASSETTE_ADD(CASSETTE_TAG, mc1000_cassette_interface)
MCFG_CASSETTE_ADD("cassette", mc1000_cassette_interface)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
/* internal ram */

View File

@ -336,10 +336,10 @@ static MACHINE_CONFIG_START( mekd2, mekd2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
/* Cartslot ?? does not come with one.. */
MCFG_CARTSLOT_ADD("cart")

View File

@ -238,7 +238,7 @@ static MACHINE_CONFIG_START( microtan, microtan_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("dac", DAC, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ay8910.1", AY8910, 1000000)
MCFG_SOUND_CONFIG(microtan_ay8910_interface)
@ -252,7 +252,7 @@ static MACHINE_CONFIG_START( microtan, microtan_state )
MCFG_QUICKLOAD_ADD("quickload", microtan, "hex", 0.5)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
/* acia */
MCFG_MOS6551_ADD("acia", XTAL_1_8432MHz, NULL)

View File

@ -189,10 +189,10 @@ static MACHINE_CONFIG_START( mikro80, mikro80_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, mikro80_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", mikro80_cassette_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( radio99, mikro80 )

View File

@ -223,12 +223,12 @@ static MACHINE_CONFIG_START( mikrosha, mikrosha_state )
MCFG_PALETTE_INIT_OVERRIDE(mikrosha_state,radio86)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_I8257_ADD("dma8257", XTAL_16MHz / 9, radio86_dma)
MCFG_CASSETTE_ADD( CASSETTE_TAG, mikrosha_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", mikrosha_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","mikrosha")
MACHINE_CONFIG_END

View File

@ -369,7 +369,7 @@ static MACHINE_CONFIG_START( mpf1, mpf1_state )
MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_3_579545MHz/2, mpf1_pio_intf)
MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_3_579545MHz/2, mpf1_ctc_intf)
MCFG_I8255A_ADD(I8255A_TAG, ppi8255_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, mpf1_cassette_interface)
MCFG_CASSETTE_ADD("cassette", mpf1_cassette_interface)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_mpf1)
@ -393,7 +393,7 @@ static MACHINE_CONFIG_START( mpf1b, mpf1_state )
MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_3_579545MHz/2, mpf1_pio_intf)
MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_3_579545MHz/2, mpf1_ctc_intf)
MCFG_I8255A_ADD(I8255A_TAG, ppi8255_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, mpf1_cassette_interface)
MCFG_CASSETTE_ADD("cassette", mpf1_cassette_interface)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_mpf1b)
@ -424,7 +424,7 @@ static MACHINE_CONFIG_START( mpf1p, mpf1_state )
MCFG_Z80PIO_ADD(Z80PIO_TAG, 2500000, mpf1_pio_intf)
MCFG_Z80CTC_ADD(Z80CTC_TAG, 2500000, mpf1_ctc_intf)
MCFG_I8255A_ADD(I8255A_TAG, ppi8255_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, mpf1_cassette_interface)
MCFG_CASSETTE_ADD("cassette", mpf1_cassette_interface)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")

View File

@ -1081,7 +1081,7 @@ static MACHINE_CONFIG_START( msx, msx_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("dac", DAC, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ay8910", AY8910, XTAL_10_738635MHz/3/2)
MCFG_SOUND_CONFIG(msx_ay8910_interface)
@ -1094,7 +1094,7 @@ static MACHINE_CONFIG_START( msx, msx_state )
/* printer */
MCFG_CENTRONICS_PRINTER_ADD("centronics", standard_centronics)
MCFG_CASSETTE_ADD( CASSETTE_TAG, msx_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", msx_cassette_interface )
MCFG_FD1793_ADD("wd179x", msx_wd17xx_interface ) // TODO confirm type
@ -1176,7 +1176,7 @@ static MACHINE_CONFIG_START( msx2, msx_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("dac", DAC, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ay8910", AY8910, XTAL_21_4772MHz/6/2)
MCFG_SOUND_CONFIG(msx_ay8910_interface)
@ -1190,7 +1190,7 @@ static MACHINE_CONFIG_START( msx2, msx_state )
MCFG_CENTRONICS_PRINTER_ADD("centronics", standard_centronics)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, msx_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", msx_cassette_interface )
/* real time clock */
MCFG_RP5C01_ADD("rtc", XTAL_32_768kHz, rtc_intf)

View File

@ -373,7 +373,7 @@ static MACHINE_CONFIG_START( mtx512, mtx_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_timer", mtx_state, ctc_tick, attotime::from_hz(XTAL_4MHz/13))
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_SNAPSHOT_ADD("snapshot", mtx, "mtb", 0.5)
MCFG_CASSETTE_ADD(CASSETTE_TAG, mtx_cassette_interface)
MCFG_CASSETTE_ADD("cassette", mtx_cassette_interface)
MCFG_TIMER_DRIVER_ADD_PERIODIC("cassette_timer", mtx_state, cassette_tick, attotime::from_hz(44100))
/* internal ram */

View File

@ -68,7 +68,7 @@ public:
m_ppi0(*this, "ppi8255_0"),
m_ppi1(*this, "ppi8255_1"),
m_ppi2(*this, "ppi8255_2"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_wave(*this, WAVE_TAG),
m_crtc(*this, "crtc"),
m_fdc(*this, "fdc"),
@ -607,7 +607,7 @@ static MACHINE_CONFIG_START( mycom, mycom_state )
MCFG_MC6845_ADD("crtc", MC6845, 1008000, mc6845_intf)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("sn1", SN76489, XTAL_10MHz / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50)
@ -615,7 +615,7 @@ static MACHINE_CONFIG_START( mycom, mycom_state )
/* Devices */
MCFG_MSM5832_ADD(MSM5832RS_TAG, XTAL_32_768kHz)
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MCFG_FD1771_ADD("fdc", wd1771_intf)
MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(mycom_floppy_interface)

View File

@ -39,7 +39,7 @@ class mz2000_state : public driver_device
public:
mz2000_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_maincpu(*this, "maincpu"),
m_mb8877a(*this, "mb8877a"),
m_pit8253(*this, "pit"),
@ -872,7 +872,7 @@ static MACHINE_CONFIG_START( mz2000, mz2000_state )
MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(mz2000_floppy_interface)
MCFG_SOFTWARE_LIST_ADD("flop_list","mz2000_flop")
MCFG_CASSETTE_ADD( CASSETTE_TAG, mz2000_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", mz2000_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","mz2000_cass")
/* video hardware */
@ -889,7 +889,7 @@ static MACHINE_CONFIG_START( mz2000, mz2000_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)

View File

@ -362,7 +362,7 @@ static MACHINE_CONFIG_START( mz700, mz_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@ -376,7 +376,7 @@ static MACHINE_CONFIG_START( mz700, mz_state )
MCFG_I8255_ADD("ppi8255", mz700_ppi8255_interface)
MCFG_TTL74145_ADD("ls145", default_ttl74145)
MCFG_CASSETTE_ADD( CASSETTE_TAG, mz700_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", mz700_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","mz700_cass")
/* internal ram */

View File

@ -295,7 +295,7 @@ static MACHINE_CONFIG_START( mz80k, mz80_state )
/* Audio */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@ -304,7 +304,7 @@ static MACHINE_CONFIG_START( mz80k, mz80_state )
MCFG_I8255_ADD( "ppi8255", mz80k_8255_int )
MCFG_PIT8253_ADD( "pit8253", mz80k_pit8253_config )
MCFG_TIMER_DRIVER_ADD_PERIODIC("tempo", mz80_state, ne555_tempo_callback, attotime::from_hz(34))
MCFG_CASSETTE_ADD( CASSETTE_TAG, mz80k_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", mz80k_cassette_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mz80kj, mz80k )

View File

@ -301,7 +301,7 @@ static MACHINE_CONFIG_START( nascom1, nascom1_state )
/* devices */
MCFG_SNAPSHOT_ADD("snapshot", nascom1, "nas", 0.5)
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

View File

@ -1392,8 +1392,8 @@ static MACHINE_CONFIG_START( newbrain_a, newbrain_state )
MCFG_FRAGMENT_ADD(newbrain_video)
// devices
MCFG_CASSETTE_ADD(CASSETTE_TAG, newbrain_cassette_interface)
MCFG_CASSETTE_ADD(CASSETTE2_TAG, newbrain_cassette_interface)
MCFG_CASSETTE_ADD("cassette", newbrain_cassette_interface)
MCFG_CASSETTE_ADD("cassette2", newbrain_cassette_interface)
// internal ram
MCFG_RAM_ADD(RAM_TAG)

View File

@ -142,10 +142,10 @@ static MACHINE_CONFIG_START( ondra, ondra_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, ondra_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", ondra_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","ondra")
/* internal ram */

View File

@ -193,10 +193,10 @@ static MACHINE_CONFIG_START( orao, orao_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("dac", DAC, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 8.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, orao_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", orao_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","orao")
MACHINE_CONFIG_END

View File

@ -393,7 +393,7 @@ static MACHINE_CONFIG_START( oric, oric_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ay8912", AY8912, 1000000)
MCFG_SOUND_CONFIG(oric_ay_interface)
@ -403,7 +403,7 @@ static MACHINE_CONFIG_START( oric, oric_state )
MCFG_CENTRONICS_PRINTER_ADD("centronics", oric_centronics_config)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, oric_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", oric_cassette_interface )
/* via */
MCFG_VIA6522_ADD( "via6522_0", 1000000, oric_6522_interface )

View File

@ -117,10 +117,10 @@ static MACHINE_CONFIG_START( orion128, orion_state )
MCFG_VIDEO_START_OVERRIDE(orion_state,orion128)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, orion_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", orion_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","orion_cass")
MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8)
@ -184,13 +184,13 @@ static MACHINE_CONFIG_START( orionz80, orion_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ay8912", AY8912, 1773400)
MCFG_SOUND_CONFIG(orionz80_ay_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_CASSETTE_ADD( CASSETTE_TAG, orion_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", orion_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","orion_cass")
MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8)
@ -244,13 +244,13 @@ static MACHINE_CONFIG_START( orionpro, orion_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ay8912", AY8912, 1773400)
MCFG_SOUND_CONFIG(orionz80_ay_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_CASSETTE_ADD( CASSETTE_TAG, orion_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", orion_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","orion_cass")
MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8)

View File

@ -809,7 +809,7 @@ static MACHINE_CONFIG_START( osi600, sb2m600_state )
MCFG_ACIA6850_ADD("acia_0", osi600_acia_intf)
/* cassette */
MCFG_CASSETTE_ADD(CASSETTE_TAG, default_cassette_interface)
MCFG_CASSETTE_ADD("cassette", default_cassette_interface)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -830,7 +830,7 @@ static MACHINE_CONFIG_START( uk101, uk101_state )
MCFG_ACIA6850_ADD("acia_0", uk101_acia_intf)
/* cassette */
MCFG_CASSETTE_ADD(CASSETTE_TAG, default_cassette_interface)
MCFG_CASSETTE_ADD("cassette", default_cassette_interface)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@ -863,7 +863,7 @@ static MACHINE_CONFIG_START( c1p, c1p_state )
MCFG_ACIA6850_ADD("acia_0", osi600_acia_intf)
/* cassette */
MCFG_CASSETTE_ADD(CASSETTE_TAG, default_cassette_interface)
MCFG_CASSETTE_ADD("cassette", default_cassette_interface)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

View File

@ -212,12 +212,12 @@ static MACHINE_CONFIG_START( partner, partner_state )
MCFG_PALETTE_INIT_OVERRIDE(partner_state,radio86)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_I8257_ADD("dma8257", XTAL_16MHz / 9, partner_dma)
MCFG_CASSETTE_ADD( CASSETTE_TAG, partner_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", partner_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","partner_cass")
MCFG_FD1793_ADD("wd1793", partner_wd17xx_interface )

View File

@ -1303,7 +1303,7 @@ static MACHINE_CONFIG_START( ibmpcjr, pc_state )
MCFG_PC_JOY_ADD("joy")
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, ibm5150_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", ibm5150_cassette_interface )
MCFG_UPD765A_ADD("upd765", false, false)
@ -1382,7 +1382,7 @@ static MACHINE_CONFIG_START( mc1502, pc_state )
// MCFG_PC_LPT_ADD("lpt_0", pc_lpt_config) /* TODO: non-standard */
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, mc1502_cassette_interface ) // has no motor control
MCFG_CASSETTE_ADD( "cassette", mc1502_cassette_interface ) // has no motor control
MCFG_FD1793x_ADD("vg93", XTAL_8MHz / 8) // clock?
MCFG_FLOPPY_DRIVE_ADD("fd0", ibmpc_floppies, "525dd", 0, pc_state::floppy_formats)

View File

@ -143,7 +143,7 @@ public:
m_ppi(*this, "ppi8255"),
m_ram(*this, "ram"),
m_maincpu(*this, "maincpu"),
m_cassette(*this, CASSETTE_TAG),
m_cassette(*this, "cassette"),
m_region_maincpu(*this, "maincpu"),
m_region_gfx1(*this, "gfx1"),
m_region_cas(*this, "cas"),
@ -2388,8 +2388,8 @@ static MACHINE_CONFIG_START( pc6001, pc6001_state )
MCFG_CARTSLOT_EXTENSION_LIST("bin")
MCFG_CARTSLOT_NOT_MANDATORY
// MCFG_CASSETTE_ADD(CASSETTE_TAG,pc6001_cassette_interface)
MCFG_CARTSLOT_ADD(CASSETTE_TAG)
// MCFG_CASSETTE_ADD("cassette",pc6001_cassette_interface)
MCFG_CARTSLOT_ADD("cassette")
MCFG_CARTSLOT_EXTENSION_LIST("cas,p6")
MCFG_CARTSLOT_NOT_MANDATORY
MCFG_CARTSLOT_INTERFACE("pc6001_cass")
@ -2399,7 +2399,7 @@ static MACHINE_CONFIG_START( pc6001, pc6001_state )
MCFG_SOUND_ADD("ay8910", AY8910, PC6001_MAIN_CLOCK/4)
MCFG_SOUND_CONFIG(pc6001_ay_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
// MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* TODO: accurate timing on this */

View File

@ -573,7 +573,7 @@ static MACHINE_CONFIG_START( pc8001, pc8001_state )
MCFG_UPD3301_ADD(UPD3301_TAG, 14318180, pc8001_upd3301_intf)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_CASSETTE_ADD(CASSETTE_TAG, pc8001_cassette_interface)
MCFG_CASSETTE_ADD("cassette", pc8001_cassette_interface)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("16K")
@ -607,7 +607,7 @@ static MACHINE_CONFIG_START( pc8001mk2, pc8001mk2_state )
MCFG_UPD3301_ADD(UPD3301_TAG, 14318180, pc8001_upd3301_intf)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MCFG_CASSETTE_ADD(CASSETTE_TAG, pc8001_cassette_interface)
MCFG_CASSETTE_ADD("cassette", pc8001_cassette_interface)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")

View File

@ -303,7 +303,7 @@ public:
m_fdccpu(*this, "fdccpu"),
m_pic(*this, I8214_TAG),
m_rtc(*this, UPD1990A_TAG),
m_cassette(*this, CASSETTE_TAG)
m_cassette(*this, "cassette")
{ }
required_device<cpu_device> m_maincpu;
@ -2679,7 +2679,7 @@ static MACHINE_CONFIG_START( pc8801, pc8801_state )
#endif
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, pc8801_upd1990a_intf)
//MCFG_CENTRONICS_PRINTER_ADD("centronics", standard_centronics)
MCFG_CASSETTE_ADD(CASSETTE_TAG, pc8801_cassette_interface)
MCFG_CASSETTE_ADD("cassette", pc8801_cassette_interface)
MCFG_SOFTWARE_LIST_ADD("tape_list","pc8801_cass")
MCFG_I8251_ADD(I8251_TAG, uart_intf)

View File

@ -74,7 +74,7 @@ public:
m_ctc_s(*this, "z80ctc_s"),
m_ctc_u(*this, "z80ctc_u"),
m_speaker(*this, "speaker"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_p_videoram(*this, "videoram"){ }
required_device<cpu_device> m_maincpu;
@ -317,14 +317,14 @@ static MACHINE_CONFIG_START( pcm, pcm_state )
/* Sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
MCFG_K7659_KEYBOARD_ADD()
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MCFG_Z80PIO_ADD( "z80pio_u", XTAL_10MHz /4, pio_u_intf )
MCFG_Z80PIO_ADD( "z80pio_s", XTAL_10MHz /4, pio_s_intf )
MCFG_Z80SIO_ADD( "z80sio", 4800, sio_intf ) // clocks come from the system ctc

View File

@ -187,7 +187,7 @@ static MACHINE_CONFIG_START( pecom64, pecom_state )
MCFG_FRAGMENT_ADD(pecom_video)
MCFG_CASSETTE_ADD( CASSETTE_TAG, pecom_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", pecom_cassette_interface )
MCFG_SOFTWARE_LIST_ADD("cass_list","pecom_cass")
/* internal ram */

View File

@ -51,7 +51,7 @@ public:
pegasus_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_pia_s(*this, "pia_s"),
m_pia_u(*this, "pia_u"),
m_p_videoram(*this, "p_videoram"){ }
@ -515,7 +515,7 @@ static MACHINE_CONFIG_START( pegasus, pegasus_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
@ -536,7 +536,7 @@ static MACHINE_CONFIG_START( pegasus, pegasus_state )
MCFG_CARTSLOT_ADD("cart5")
MCFG_CARTSLOT_EXTENSION_LIST("bin")
MCFG_CARTSLOT_LOAD(pegasus_state,pegasus_cart_5)
MCFG_CASSETTE_ADD( CASSETTE_TAG, pegasus_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", pegasus_cassette_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pegasusm, pegasus )

View File

@ -88,7 +88,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_printer(*this, "centronics"),
m_cass(*this, CASSETTE_TAG)
m_cass(*this, "cassette")
{ }
DECLARE_WRITE8_MEMBER(port10_w);
@ -296,11 +296,11 @@ static MACHINE_CONFIG_START( pencil2, pencil2_state )
MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL_10_738635MHz/3) // guess
MCFG_SOUND_CONFIG(psg_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
/* cartridge */
// MCFG_CARTSLOT_ADD("cart")

View File

@ -363,7 +363,7 @@ static MACHINE_CONFIG_START( phc25, phc25_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_CASSETTE_ADD(CASSETTE_TAG, phc25_cassette_interface)
MCFG_CASSETTE_ADD("cassette", phc25_cassette_interface)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
/* internal ram */

View File

@ -34,7 +34,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_speaker(*this, "speaker"),
m_cass(*this, CASSETTE_TAG),
m_cass(*this, "cassette"),
m_videoram(*this, "videoram") { }
DECLARE_READ8_MEMBER( phunsy_data_r );
@ -310,14 +310,14 @@ static MACHINE_CONFIG_START( phunsy, phunsy_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
MCFG_ASCII_KEYBOARD_ADD(KEYBOARD_TAG, keyboard_intf)
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MACHINE_CONFIG_END

View File

@ -24,7 +24,7 @@ public:
pk8000_state(const machine_config &mconfig, device_type type, const char *tag)
: pk8000_base_state(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_cassette(*this, CASSETTE_TAG)
, m_cassette(*this, "cassette")
, m_ram(*this, RAM_TAG)
, m_speaker(*this, "speaker")
, m_region_maincpu(*this, "maincpu")
@ -398,10 +398,10 @@ static MACHINE_CONFIG_START( pk8000, pk8000_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, pk8000_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", pk8000_cassette_interface )
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

View File

@ -234,10 +234,10 @@ static MACHINE_CONFIG_START( pk8020, pk8020_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CASSETTE_ADD( CASSETTE_TAG, pk8020_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", pk8020_cassette_interface )
MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(pk8020_floppy_interface)
MCFG_SOFTWARE_LIST_ADD("flop_list","korvet_flop")

View File

@ -567,11 +567,11 @@ static MACHINE_CONFIG_START( pmd85, pmd85_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, pmd85_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", pmd85_cassette_interface )
/* uart */
MCFG_I8251_ADD("uart", default_i8251_interface)

View File

@ -187,11 +187,11 @@ static MACHINE_CONFIG_START( poly88, poly88_state )
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* cassette */
MCFG_CASSETTE_ADD( CASSETTE_TAG, poly88_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", poly88_cassette_interface )
/* uart */
MCFG_I8251_ADD("uart", poly88_usart_interface)

View File

@ -290,7 +290,7 @@ static MACHINE_CONFIG_START( poly880, poly880_state )
MCFG_Z80PIO_ADD(Z80PIO1_TAG, XTAL_7_3728MHz/16, pio1_intf)
MCFG_Z80PIO_ADD(Z80PIO2_TAG, XTAL_7_3728MHz/16, pio2_intf)
MCFG_CASSETTE_ADD(CASSETTE_TAG, poly880_cassette_interface)
MCFG_CASSETTE_ADD("cassette", poly880_cassette_interface)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

View File

@ -269,7 +269,7 @@ static MACHINE_CONFIG_START( primoa32, primo_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@ -278,7 +278,7 @@ static MACHINE_CONFIG_START( primoa32, primo_state )
MCFG_SNAPSHOT_ADD("snapshot", primo, "pss", 0)
MCFG_QUICKLOAD_ADD("quickload", primo, "pp", 0)
MCFG_CASSETTE_ADD( CASSETTE_TAG, primo_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", primo_cassette_interface )
/* floppy from serial bus */
MCFG_CBM_IEC_ADD(NULL)

View File

@ -29,7 +29,7 @@ public:
pro80_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cass(*this, CASSETTE_TAG)
m_cass(*this, "cassette")
{ }
required_device<cpu_device> m_maincpu;
@ -149,11 +149,11 @@ static MACHINE_CONFIG_START( pro80, pro80_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* Devices */
MCFG_CASSETTE_ADD( CASSETTE_TAG, default_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
MACHINE_CONFIG_END
/* ROM definition */

View File

@ -126,8 +126,8 @@ public:
sol20_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cass1(*this, CASSETTE_TAG),
m_cass2(*this, CASSETTE2_TAG),
m_cass1(*this, "cassette"),
m_cass2(*this, "cassette2"),
m_uart(*this, "uart"),
m_uart_s(*this, "uart_s"),
m_p_videoram(*this, "videoram"),
@ -136,7 +136,9 @@ public:
m_iop_s1(*this, "S1"),
m_iop_s2(*this, "S2"),
m_iop_s3(*this, "S3"),
m_iop_s4(*this, "S4")
m_iop_s4(*this, "S4"),
m_cassette1(*this, "cassette"),
m_cassette2(*this, "cassette2")
{ }
DECLARE_READ8_MEMBER( sol20_f8_r );
@ -177,6 +179,8 @@ private:
const UINT8 *m_p_chargen;
UINT8 m_framecnt;
emu_timer *m_cassette_timer;
required_device<cassette_image_device> m_cassette1;
required_device<cassette_image_device> m_cassette2;
public:
DECLARE_DRIVER_INIT(sol20);
TIMER_CALLBACK_MEMBER(sol20_cassette_tc);
@ -191,9 +195,9 @@ public:
cassette_image_device *sol20_state::cassette_device_image()
{
if (m_sol20_fa & 0x40)
return machine().device<cassette_image_device>(CASSETTE2_TAG);
return m_cassette2;
else
return machine().device<cassette_image_device>(CASSETTE_TAG);
return m_cassette1;
}
@ -734,14 +738,14 @@ static MACHINE_CONFIG_START( sol20, sol20_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // cass1 speaker
MCFG_SOUND_WAVE_ADD(WAVE2_TAG, CASSETTE2_TAG)
MCFG_SOUND_WAVE_ADD(WAVE2_TAG, "cassette2")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // cass2 speaker
// devices
MCFG_CASSETTE_ADD( CASSETTE_TAG, sol20_cassette_interface )
MCFG_CASSETTE_ADD( CASSETTE2_TAG, sol20_cassette_interface )
MCFG_CASSETTE_ADD( "cassette", sol20_cassette_interface )
MCFG_CASSETTE_ADD( "cassette2", sol20_cassette_interface )
MCFG_AY31015_ADD( "uart", sol20_ay31015_config )
MCFG_AY31015_ADD( "uart_s", sol20_ay31015_config )
MCFG_ASCII_KEYBOARD_ADD(KEYBOARD_TAG, keyboard_intf)

Some files were not shown because too many files have changed in this diff Show More