From 6c11b3ce0131be3b14edf5ef93fa9cb2380ae45b Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 9 May 2018 19:26:44 +1000 Subject: dsp16: fix condition mask in disassembler (nw) (nw) remove more MCFG macros and make speaker config more explicit --- src/devices/bus/centronics/covox.cpp | 5 +++-- src/devices/bus/centronics/digiblst.cpp | 2 +- src/devices/bus/centronics/epson_ex800.cpp | 2 +- src/devices/bus/centronics/epson_lx800.cpp | 2 +- src/devices/bus/centronics/epson_lx810l.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/devices/bus/centronics') diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp index 9db269fc137..e508578ffe6 100644 --- a/src/devices/bus/centronics/covox.cpp +++ b/src/devices/bus/centronics/covox.cpp @@ -40,7 +40,7 @@ centronics_covox_device::centronics_covox_device(const machine_config &mconfig, MACHINE_CONFIG_START(centronics_covox_device::device_add_mconfig) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) @@ -89,7 +89,8 @@ centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_con MACHINE_CONFIG_START(centronics_covox_stereo_device::device_add_mconfig) /* sound hardware */ - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC MCFG_DEVICE_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp index a97f86a3c8a..99a046f4d13 100644 --- a/src/devices/bus/centronics/digiblst.cpp +++ b/src/devices/bus/centronics/digiblst.cpp @@ -40,7 +40,7 @@ centronics_digiblaster_device::centronics_digiblaster_device(const machine_confi MACHINE_CONFIG_START(centronics_digiblaster_device::device_add_mconfig) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp index aa25e459cc8..b6b2b9348f6 100644 --- a/src/devices/bus/centronics/epson_ex800.cpp +++ b/src/devices/bus/centronics/epson_ex800.cpp @@ -229,7 +229,7 @@ MACHINE_CONFIG_START(epson_ex800_device::device_add_mconfig) MCFG_DEFAULT_LAYOUT(layout_ex800) /* audio hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("beeper", BEEP, 4000) /* measured at 4000 Hz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp index 9e782023bb5..d86737dabfe 100644 --- a/src/devices/bus/centronics/epson_lx800.cpp +++ b/src/devices/bus/centronics/epson_lx800.cpp @@ -85,7 +85,7 @@ MACHINE_CONFIG_START(epson_lx800_device::device_add_mconfig) MCFG_DEFAULT_LAYOUT(layout_lx800) /* audio hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("beeper", BEEP, 4000) // ? MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05) diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index a3c327267b8..4da390513c5 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -141,7 +141,7 @@ MACHINE_CONFIG_START(epson_lx810l_device::device_add_mconfig) MCFG_SCREEN_UPDATE_DRIVER(epson_lx810l_device, screen_update_lx810l) /* audio hardware */ - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) -- cgit v1.2.3-70-g09d2