summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/hh_sm510.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/hh_sm510.cpp')
-rw-r--r--src/mame/drivers/hh_sm510.cpp774
1 files changed, 387 insertions, 387 deletions
diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp
index 16aea9b09d8..e20896a681f 100644
--- a/src/mame/drivers/hh_sm510.cpp
+++ b/src/mame/drivers/hh_sm510.cpp
@@ -264,12 +264,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kdribble_state::kdribble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -282,7 +282,7 @@ MACHINE_CONFIG_START(kdribble_state::kdribble)
/* 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
@@ -337,12 +337,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ktopgun_state::ktopgun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -355,7 +355,7 @@ MACHINE_CONFIG_START(ktopgun_state::ktopgun)
/* 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
@@ -412,11 +412,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kcontra_state::kcontra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -429,7 +429,7 @@ MACHINE_CONFIG_START(kcontra_state::kcontra)
/* 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
@@ -485,11 +485,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ktmnt_state::ktmnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -502,7 +502,7 @@ MACHINE_CONFIG_START(ktmnt_state::ktmnt)
/* 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
@@ -555,11 +555,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kgradius_state::kgradius)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -572,7 +572,7 @@ MACHINE_CONFIG_START(kgradius_state::kgradius)
/* 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
@@ -623,11 +623,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kloneran_state::kloneran)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -640,7 +640,7 @@ MACHINE_CONFIG_START(kloneran_state::kloneran)
/* 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
@@ -695,11 +695,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kblades_state::kblades)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -711,7 +711,7 @@ MACHINE_CONFIG_START(kblades_state::kblades)
/* 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
@@ -768,11 +768,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(knfl_state::knfl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -784,7 +784,7 @@ MACHINE_CONFIG_START(knfl_state::knfl)
/* 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
@@ -840,11 +840,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kbilly_state::kbilly)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -856,7 +856,7 @@ MACHINE_CONFIG_START(kbilly_state::kbilly)
/* 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
@@ -906,11 +906,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kbucky_state::kbucky)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -922,7 +922,7 @@ MACHINE_CONFIG_START(kbucky_state::kbucky)
/* 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
@@ -976,11 +976,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kgarfld_state::kgarfld)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -992,7 +992,7 @@ MACHINE_CONFIG_START(kgarfld_state::kgarfld)
/* 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
@@ -1069,11 +1069,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mmouse_state::gnw_mmouse)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM5A, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM5A, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // ?
- MCFG_SM500_WRITE_O_CB(WRITE8(hh_sm510_state, sm500_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_input_w))
+ MCFG_SM500_WRITE_O_CB(WRITE8(*this, hh_sm510_state, sm500_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_input_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
/* video hardware */
@@ -1087,7 +1087,7 @@ MACHINE_CONFIG_START(gnw_mmouse_state::gnw_mmouse)
/* 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
@@ -1104,11 +1104,11 @@ MACHINE_CONFIG_START(gnw_mmouse_state::nupogodi)
gnw_mmouse(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", KB1013VK12, 32.768_kHz_XTAL)
+ MCFG_DEVICE_REPLACE("maincpu", KB1013VK12, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM500_WRITE_O_CB(WRITE8(hh_sm510_state, sm500_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_input_w))
+ MCFG_SM500_WRITE_O_CB(WRITE8(*this, hh_sm510_state, sm500_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_input_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
/* video hardware */
@@ -1178,12 +1178,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mickdon_state::gnw_mickdon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r2_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r2_w))
MCFG_SM510_READ_B_CB(IOPORT("B"))
/* video hardware */
@@ -1202,7 +1202,7 @@ MACHINE_CONFIG_START(gnw_mickdon_state::gnw_mickdon)
/* 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
@@ -1262,12 +1262,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_dkong2_state::gnw_dkong2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_B_CB(IOPORT("B"))
/* video hardware */
@@ -1286,7 +1286,7 @@ MACHINE_CONFIG_START(gnw_dkong2_state::gnw_dkong2)
/* 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
@@ -1347,12 +1347,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mario_state::gnw_mario)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1372,7 +1372,7 @@ MACHINE_CONFIG_START(gnw_mario_state::gnw_mario)
/* 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
@@ -1439,12 +1439,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_dkjr_state::gnw_dkjr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1459,7 +1459,7 @@ MACHINE_CONFIG_START(gnw_dkjr_state::gnw_dkjr)
/* 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,12 +1521,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mariocm_state::gnw_mariocm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1541,7 +1541,7 @@ MACHINE_CONFIG_START(gnw_mariocm_state::gnw_mariocm)
/* 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
@@ -1606,11 +1606,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_smb_state::gnw_smb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_B_CB(IOPORT("B"))
/* video hardware */
@@ -1624,7 +1624,7 @@ MACHINE_CONFIG_START(gnw_smb_state::gnw_smb)
/* 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
@@ -1708,11 +1708,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_boxing_state::gnw_boxing)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1727,7 +1727,7 @@ MACHINE_CONFIG_START(gnw_boxing_state::gnw_boxing)
/* 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
@@ -1818,12 +1818,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgaunt_state::tgaunt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1838,7 +1838,7 @@ MACHINE_CONFIG_START(tgaunt_state::tgaunt)
/* 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,12 +1921,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tddragon_state::tddragon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1941,7 +1941,7 @@ MACHINE_CONFIG_START(tddragon_state::tddragon)
/* 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
@@ -2016,12 +2016,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tkarnov_state::tkarnov)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2036,7 +2036,7 @@ MACHINE_CONFIG_START(tkarnov_state::tkarnov)
/* 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
@@ -2110,12 +2110,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tvindictr_state::tvindictr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2130,7 +2130,7 @@ MACHINE_CONFIG_START(tvindictr_state::tvindictr)
/* 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
@@ -2227,12 +2227,12 @@ void tgaiden_state::machine_start()
MACHINE_CONFIG_START(tgaiden_state::tgaiden)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(tgaiden_state, write_r))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, tgaiden_state, write_r))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2247,7 +2247,7 @@ MACHINE_CONFIG_START(tgaiden_state::tgaiden)
/* 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
@@ -2317,12 +2317,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbatman_state::tbatman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2337,7 +2337,7 @@ MACHINE_CONFIG_START(tbatman_state::tbatman)
/* 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
@@ -2411,12 +2411,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsharr2_state::tsharr2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2431,7 +2431,7 @@ MACHINE_CONFIG_START(tsharr2_state::tsharr2)
/* 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
@@ -2502,12 +2502,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tstrider_state::tstrider)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2522,7 +2522,7 @@ MACHINE_CONFIG_START(tstrider_state::tstrider)
/* 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
@@ -2597,12 +2597,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgoldnaxe_state::tgoldnaxe)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2617,7 +2617,7 @@ MACHINE_CONFIG_START(tgoldnaxe_state::tgoldnaxe)
/* 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
@@ -2692,12 +2692,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(trobocop2_state::trobocop2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2712,7 +2712,7 @@ MACHINE_CONFIG_START(trobocop2_state::trobocop2)
/* 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
@@ -2791,12 +2791,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(taltbeast_state::taltbeast)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2811,7 +2811,7 @@ MACHINE_CONFIG_START(taltbeast_state::taltbeast)
/* 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
@@ -2886,12 +2886,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsf2010_state::tsf2010)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2906,7 +2906,7 @@ MACHINE_CONFIG_START(tsf2010_state::tsf2010)
/* 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
@@ -2977,12 +2977,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tswampt_state::tswampt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2997,7 +2997,7 @@ MACHINE_CONFIG_START(tswampt_state::tswampt)
/* 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
@@ -3072,12 +3072,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tspidman_state::tspidman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3092,7 +3092,7 @@ MACHINE_CONFIG_START(tspidman_state::tspidman)
/* 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
@@ -3167,12 +3167,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tddragon3_state::tddragon3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3187,7 +3187,7 @@ MACHINE_CONFIG_START(tddragon3_state::tddragon3)
/* 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
@@ -3262,12 +3262,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tflash_state::tflash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3282,7 +3282,7 @@ MACHINE_CONFIG_START(tflash_state::tflash)
/* 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
@@ -3358,11 +3358,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmchammer_state::tmchammer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3377,7 +3377,7 @@ MACHINE_CONFIG_START(tmchammer_state::tmchammer)
/* 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
@@ -3452,12 +3452,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbtoads_state::tbtoads)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3472,7 +3472,7 @@ MACHINE_CONFIG_START(tbtoads_state::tbtoads)
/* 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
@@ -3547,12 +3547,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(thook_state::thook)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3567,7 +3567,7 @@ MACHINE_CONFIG_START(thook_state::thook)
/* 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
@@ -3641,12 +3641,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbttf_state::tbttf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3661,7 +3661,7 @@ MACHINE_CONFIG_START(tbttf_state::tbttf)
/* 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
@@ -3738,12 +3738,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(taddams_state::taddams)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3758,7 +3758,7 @@ MACHINE_CONFIG_START(taddams_state::taddams)
/* 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
@@ -3833,12 +3833,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(thalone_state::thalone)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3853,7 +3853,7 @@ MACHINE_CONFIG_START(thalone_state::thalone)
/* 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
@@ -3924,12 +3924,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(txmenpx_state::txmenpx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3944,7 +3944,7 @@ MACHINE_CONFIG_START(txmenpx_state::txmenpx)
/* 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
@@ -4019,12 +4019,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(thalone2_state::thalone2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4039,7 +4039,7 @@ MACHINE_CONFIG_START(thalone2_state::thalone2)
/* 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
@@ -4138,11 +4138,11 @@ static const s16 tsonic_speaker_levels[] = { 0, 0x7fff/3*1, 0x7fff/3*2, 0x7fff }
MACHINE_CONFIG_START(tsonic_state::tsonic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(tsonic_state, write_s))
- MCFG_SM510_WRITE_R_CB(WRITE8(tsonic_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, tsonic_state, write_s))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, tsonic_state, write_r))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4156,7 +4156,7 @@ MACHINE_CONFIG_START(tsonic_state::tsonic)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, tsonic_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4232,12 +4232,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(trobocop3_state::trobocop3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4252,7 +4252,7 @@ MACHINE_CONFIG_START(trobocop3_state::trobocop3)
/* 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
@@ -4323,12 +4323,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tdummies_state::tdummies)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4343,7 +4343,7 @@ MACHINE_CONFIG_START(tdummies_state::tdummies)
/* 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
@@ -4418,12 +4418,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsfight2_state::tsfight2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4438,7 +4438,7 @@ MACHINE_CONFIG_START(tsfight2_state::tsfight2)
/* 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
@@ -4509,12 +4509,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tjpark_state::tjpark)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4529,7 +4529,7 @@ MACHINE_CONFIG_START(tjpark_state::tjpark)
/* 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
@@ -4628,11 +4628,11 @@ static const s16 tsonic2_speaker_levels[] = { 0, 0x7fff/3*1, 0x7fff/3*2, 0x7fff
MACHINE_CONFIG_START(tsonic2_state::tsonic2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(tsonic2_state, write_s))
- MCFG_SM510_WRITE_R_CB(WRITE8(tsonic2_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, tsonic2_state, write_s))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, tsonic2_state, write_r))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4646,7 +4646,7 @@ MACHINE_CONFIG_START(tsonic2_state::tsonic2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, tsonic2_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4727,12 +4727,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsddragon_state::tsddragon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4747,7 +4747,7 @@ MACHINE_CONFIG_START(tsddragon_state::tsddragon)
/* 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
@@ -4823,12 +4823,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tdennis_state::tdennis)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4843,7 +4843,7 @@ MACHINE_CONFIG_START(tdennis_state::tdennis)
/* 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
@@ -4922,12 +4922,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tnmarebc_state::tnmarebc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(tnmarebc_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, tnmarebc_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4942,7 +4942,7 @@ MACHINE_CONFIG_START(tnmarebc_state::tnmarebc)
/* 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
@@ -5017,12 +5017,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ttransf2_state::ttransf2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5037,7 +5037,7 @@ MACHINE_CONFIG_START(ttransf2_state::ttransf2)
/* 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
@@ -5113,12 +5113,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmkombat_state::tmkombat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5133,7 +5133,7 @@ MACHINE_CONFIG_START(tmkombat_state::tmkombat)
/* 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
@@ -5208,12 +5208,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tshadow_state::tshadow)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5228,7 +5228,7 @@ MACHINE_CONFIG_START(tshadow_state::tshadow)
/* 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
@@ -5303,12 +5303,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tskelwarr_state::tskelwarr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5323,7 +5323,7 @@ MACHINE_CONFIG_START(tskelwarr_state::tskelwarr)
/* 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
@@ -5399,12 +5399,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbatfor_state::tbatfor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5419,7 +5419,7 @@ MACHINE_CONFIG_START(tbatfor_state::tbatfor)
/* 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
@@ -5495,12 +5495,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tjdredd_state::tjdredd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5515,7 +5515,7 @@ MACHINE_CONFIG_START(tjdredd_state::tjdredd)
/* 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
@@ -5591,12 +5591,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tapollo13_state::tapollo13)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5611,7 +5611,7 @@ MACHINE_CONFIG_START(tapollo13_state::tapollo13)
/* 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
@@ -5687,12 +5687,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgoldeye_state::tgoldeye)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5707,7 +5707,7 @@ MACHINE_CONFIG_START(tgoldeye_state::tgoldeye)
/* 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
@@ -5778,12 +5778,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tinday_state::tinday)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5798,7 +5798,7 @@ MACHINE_CONFIG_START(tinday_state::tinday)
/* 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
@@ -5869,12 +5869,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsjam_state::tsjam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL) // no external XTAL
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL) // no external XTAL
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5889,7 +5889,7 @@ MACHINE_CONFIG_START(tsjam_state::tsjam)
/* 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
@@ -5974,12 +5974,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tigarden_state::tigarden)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -5992,7 +5992,7 @@ MACHINE_CONFIG_START(tigarden_state::tigarden)
/* 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
@@ -6075,11 +6075,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(nummunch_state::nummunch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -6092,7 +6092,7 @@ MACHINE_CONFIG_START(nummunch_state::nummunch)
/* 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