summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/hh_ucom4.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/hh_ucom4.cpp')
-rw-r--r--src/mame/drivers/hh_ucom4.cpp368
1 files changed, 184 insertions, 184 deletions
diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp
index b58706acff3..cf5fb92957b 100644
--- a/src/mame/drivers/hh_ucom4.cpp
+++ b/src/mame/drivers/hh_ucom4.cpp
@@ -332,16 +332,16 @@ static const s16 ufombs_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(ufombs_state::ufombs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(ufombs_state, plate_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(ufombs_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(ufombs_state, speaker_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(ufombs_state, grid_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(ufombs_state, grid_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(ufombs_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(ufombs_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, ufombs_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, ufombs_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, ufombs_state, speaker_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, ufombs_state, grid_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, ufombs_state, grid_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, ufombs_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, ufombs_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -353,7 +353,7 @@ MACHINE_CONFIG_START(ufombs_state::ufombs)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, ufombs_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -479,16 +479,16 @@ static const s16 ssfball_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(ssfball_state::ssfball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.3"))
- MCFG_UCOM4_READ_B_CB(READ8(ssfball_state, input_b_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(ssfball_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(ssfball_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(ssfball_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(ssfball_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(ssfball_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(ssfball_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(ssfball_state, plate_w))
+ MCFG_UCOM4_READ_B_CB(READ8(*this, ssfball_state, input_b_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, ssfball_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, ssfball_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, ssfball_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, ssfball_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, ssfball_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, ssfball_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, ssfball_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -500,7 +500,7 @@ MACHINE_CONFIG_START(ssfball_state::ssfball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, ssfball_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -607,16 +607,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bmsoccer_state::bmsoccer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
- MCFG_UCOM4_READ_A_CB(READ8(bmsoccer_state, input_a_r))
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 400000) // approximation
+ MCFG_UCOM4_READ_A_CB(READ8(*this, bmsoccer_state, input_a_r))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.2"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(bmsoccer_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(bmsoccer_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(bmsoccer_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(bmsoccer_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(bmsoccer_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(bmsoccer_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(bmsoccer_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, bmsoccer_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, bmsoccer_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, bmsoccer_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, bmsoccer_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, bmsoccer_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, bmsoccer_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, bmsoccer_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -628,7 +628,7 @@ MACHINE_CONFIG_START(bmsoccer_state::bmsoccer)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -715,15 +715,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bmsafari_state::bmsafari)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(bmsafari_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(bmsafari_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(bmsafari_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(bmsafari_state, speaker_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(bmsafari_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(bmsafari_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, bmsafari_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, bmsafari_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, bmsafari_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, bmsafari_state, speaker_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, bmsafari_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, bmsafari_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -735,7 +735,7 @@ MACHINE_CONFIG_START(bmsafari_state::bmsafari)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -865,16 +865,16 @@ static const s16 splasfgt_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(splasfgt_state::splasfgt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.4"))
- MCFG_UCOM4_READ_B_CB(READ8(splasfgt_state, input_b_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(splasfgt_state, plate_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(splasfgt_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(splasfgt_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(splasfgt_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(splasfgt_state, grid_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(splasfgt_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(splasfgt_state, grid_w))
+ MCFG_UCOM4_READ_B_CB(READ8(*this, splasfgt_state, input_b_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, splasfgt_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, splasfgt_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, splasfgt_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, splasfgt_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, splasfgt_state, grid_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, splasfgt_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, splasfgt_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -886,7 +886,7 @@ MACHINE_CONFIG_START(splasfgt_state::splasfgt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, splasfgt_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -969,16 +969,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bcclimbr_state::bcclimbr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(bcclimbr_state, plate_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(bcclimbr_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(bcclimbr_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(bcclimbr_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(bcclimbr_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(bcclimbr_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(bcclimbr_state, grid_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, bcclimbr_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, bcclimbr_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, bcclimbr_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, bcclimbr_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, bcclimbr_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, bcclimbr_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, bcclimbr_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -990,7 +990,7 @@ MACHINE_CONFIG_START(bcclimbr_state::bcclimbr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1092,20 +1092,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tactix_state::tactix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D557L, 400000) // approximation
- MCFG_UCOM4_READ_A_CB(READ8(tactix_state, input_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tactix_state, input_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tactix_state, leds_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tactix_state, input_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tactix_state, leds_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tactix_state, speaker_w))
+ MCFG_DEVICE_ADD("maincpu", NEC_D557L, 400000) // approximation
+ MCFG_UCOM4_READ_A_CB(READ8(*this, tactix_state, input_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tactix_state, input_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tactix_state, leds_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tactix_state, input_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tactix_state, leds_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tactix_state, speaker_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_tactix)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1186,16 +1186,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(invspace_state::invspace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(invspace_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(invspace_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(invspace_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(invspace_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(invspace_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(invspace_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(invspace_state, grid_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, invspace_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, invspace_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, invspace_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, invspace_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, invspace_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, invspace_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, invspace_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1207,7 +1207,7 @@ MACHINE_CONFIG_START(invspace_state::invspace)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1302,23 +1302,23 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(efball_state::efball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_READ_C_CB(IOPORT("IN.2"))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(efball_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(efball_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(efball_state, grid_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(efball_state, grid_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(efball_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(efball_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, efball_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, efball_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, efball_state, grid_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, efball_state, grid_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, efball_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, efball_state, plate_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_efball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1402,16 +1402,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(galaxy2_state::galaxy2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(galaxy2_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(galaxy2_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(galaxy2_state, grid_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(galaxy2_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(galaxy2_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(galaxy2_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(galaxy2_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, galaxy2_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, galaxy2_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, galaxy2_state, grid_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, galaxy2_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, galaxy2_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, galaxy2_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, galaxy2_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1423,7 +1423,7 @@ MACHINE_CONFIG_START(galaxy2_state::galaxy2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1521,16 +1521,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(astrocmd_state::astrocmd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(astrocmd_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(astrocmd_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(astrocmd_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(astrocmd_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(astrocmd_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(astrocmd_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(astrocmd_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, astrocmd_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, astrocmd_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, astrocmd_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, astrocmd_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, astrocmd_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, astrocmd_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, astrocmd_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1542,7 +1542,7 @@ MACHINE_CONFIG_START(astrocmd_state::astrocmd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1617,16 +1617,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(edracula_state::edracula)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(edracula_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(edracula_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(edracula_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(edracula_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(edracula_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(edracula_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(edracula_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, edracula_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, edracula_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, edracula_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, edracula_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, edracula_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, edracula_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, edracula_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1638,7 +1638,7 @@ MACHINE_CONFIG_START(edracula_state::edracula)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1705,14 +1705,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mcompgin_state::mcompgin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D650, 400_kHz_XTAL) // TDK FCR400K
+ MCFG_DEVICE_ADD("maincpu", NEC_D650, 400_kHz_XTAL) // TDK FCR400K
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(mcompgin_state, lcd_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, mcompgin_state, lcd_w))
/* video hardware */
MCFG_DEVICE_ADD("lcd", HLCD0530, 500) // C=0.01uF
- MCFG_HLCD0515_WRITE_COLS_CB(WRITE32(mcompgin_state, lcd_output_w))
+ MCFG_HLCD0515_WRITE_COLS_CB(WRITE32(*this, mcompgin_state, lcd_output_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_mcompgin)
@@ -1802,23 +1802,23 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mvbfree_state::mvbfree)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(mvbfree_state, plate_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(mvbfree_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(mvbfree_state, grid_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(mvbfree_state, grid_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(mvbfree_state, grid_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(mvbfree_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(mvbfree_state, speaker_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, mvbfree_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, mvbfree_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, mvbfree_state, grid_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, mvbfree_state, grid_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, mvbfree_state, grid_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, mvbfree_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, mvbfree_state, speaker_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_mvbfree)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1921,19 +1921,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(grobot9_state::grobot9)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D557L, 160000) // approximation
- MCFG_UCOM4_READ_A_CB(READ8(grobot9_state, input_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(grobot9_state, input_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(grobot9_state, lamps_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(grobot9_state, lamps_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(grobot9_state, lamps_w))
+ MCFG_DEVICE_ADD("maincpu", NEC_D557L, 160000) // approximation
+ MCFG_UCOM4_READ_A_CB(READ8(*this, grobot9_state, input_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, grobot9_state, input_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, grobot9_state, lamps_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, grobot9_state, lamps_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, grobot9_state, lamps_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_grobot9)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2011,15 +2011,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tccombat_state::tccombat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tccombat_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tccombat_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tccombat_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tccombat_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tccombat_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tccombat_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tccombat_state, grid_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tccombat_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tccombat_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tccombat_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tccombat_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tccombat_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tccombat_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tccombat_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2031,7 +2031,7 @@ MACHINE_CONFIG_START(tccombat_state::tccombat)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2168,16 +2168,16 @@ void tmtennis_state::machine_reset()
MACHINE_CONFIG_START(tmtennis_state::tmtennis)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 360000) // see set_clock
- MCFG_UCOM4_READ_A_CB(READ8(tmtennis_state, input_r))
- MCFG_UCOM4_READ_B_CB(READ8(tmtennis_state, input_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tmtennis_state, plate_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tmtennis_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tmtennis_state, port_e_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tmtennis_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tmtennis_state, grid_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tmtennis_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tmtennis_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 360000) // see set_clock
+ MCFG_UCOM4_READ_A_CB(READ8(*this, tmtennis_state, input_r))
+ MCFG_UCOM4_READ_B_CB(READ8(*this, tmtennis_state, input_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tmtennis_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tmtennis_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tmtennis_state, port_e_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tmtennis_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tmtennis_state, grid_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tmtennis_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tmtennis_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2189,7 +2189,7 @@ MACHINE_CONFIG_START(tmtennis_state::tmtennis)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2277,16 +2277,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmpacman_state::tmpacman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 430_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 430_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tmpacman_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tmpacman_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tmpacman_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tmpacman_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tmpacman_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tmpacman_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tmpacman_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tmpacman_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tmpacman_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tmpacman_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tmpacman_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tmpacman_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tmpacman_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tmpacman_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2298,7 +2298,7 @@ MACHINE_CONFIG_START(tmpacman_state::tmpacman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2380,16 +2380,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmscramb_state::tmscramb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tmscramb_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tmscramb_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tmscramb_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tmscramb_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tmscramb_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tmscramb_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tmscramb_state, grid_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tmscramb_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tmscramb_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tmscramb_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tmscramb_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tmscramb_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tmscramb_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tmscramb_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2401,7 +2401,7 @@ MACHINE_CONFIG_START(tmscramb_state::tmscramb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2480,15 +2480,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tcaveman_state::tcaveman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tcaveman_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tcaveman_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tcaveman_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tcaveman_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tcaveman_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tcaveman_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tcaveman_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tcaveman_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tcaveman_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tcaveman_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tcaveman_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tcaveman_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tcaveman_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tcaveman_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2500,7 +2500,7 @@ MACHINE_CONFIG_START(tcaveman_state::tcaveman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2612,16 +2612,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(alnchase_state::alnchase)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
- MCFG_UCOM4_READ_A_CB(READ8(alnchase_state, input_r))
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_UCOM4_READ_A_CB(READ8(*this, alnchase_state, input_r))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.2"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, alnchase_state, output_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2633,7 +2633,7 @@ MACHINE_CONFIG_START(alnchase_state::alnchase)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END