summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/toki.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/toki.cpp')
-rw-r--r--src/mame/drivers/toki.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp
index 6a6e2044507..c06ef647d33 100644
--- a/src/mame/drivers/toki.cpp
+++ b/src/mame/drivers/toki.cpp
@@ -495,13 +495,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL(20'000'000) /2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(toki_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", toki_state, irq1_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000,XTAL(20'000'000) /2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(toki_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", toki_state, irq1_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) // verified on pcb
- MCFG_CPU_PROGRAM_MAP(toki_audio_map)
- MCFG_CPU_OPCODES_MAP(toki_audio_opcodes_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4) // verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(toki_audio_map)
+ MCFG_DEVICE_OPCODES_MAP(toki_audio_opcodes_map)
MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0)
MCFG_DEVICE_ROM("audiocpu")
@@ -514,7 +514,7 @@ MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* verified */
MCFG_SCREEN_UPDATE_DRIVER(toki_state, screen_update_toki)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toki)
@@ -524,8 +524,8 @@ MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH) // verified on pcb
@@ -534,8 +534,8 @@ MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(toki_state::jujuba)
@@ -543,19 +543,19 @@ MACHINE_CONFIG_START(toki_state::jujuba)
MCFG_DEVICE_REMOVE("sei80bu")
MCFG_DEVICE_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(jujuba_audio_map)
- MCFG_CPU_OPCODES_MAP(jujuba_audio_opcodes_map)
+ MCFG_DEVICE_PROGRAM_MAP(jujuba_audio_map)
+ MCFG_DEVICE_OPCODES_MAP(jujuba_audio_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(toki_state::tokib)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10MHz causes bad slowdowns with monkey machine rd1, but is correct, 20Mhz XTAL */
- MCFG_CPU_PROGRAM_MAP(tokib_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", toki_state, irq6_line_hold)/* VBL (could be level1, same vector) */
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10MHz causes bad slowdowns with monkey machine rd1, but is correct, 20Mhz XTAL */
+ MCFG_DEVICE_PROGRAM_MAP(tokib_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", toki_state, irq6_line_hold)/* VBL (could be level1, same vector) */
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* verified with PCB */
- MCFG_CPU_PROGRAM_MAP(tokib_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* verified with PCB */
+ MCFG_DEVICE_PROGRAM_MAP(tokib_audio_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -567,7 +567,7 @@ MACHINE_CONFIG_START(toki_state::tokib)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* verified */
MCFG_SCREEN_UPDATE_DRIVER(toki_state, screen_update_tokib)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tokib)
@@ -579,11 +579,11 @@ MACHINE_CONFIG_START(toki_state::tokib)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(toki_state, tokib_adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, toki_state, tokib_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END