summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/legionna.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/legionna.cpp')
-rw-r--r--src/mame/drivers/legionna.cpp158
1 files changed, 79 insertions, 79 deletions
diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp
index 81ea917f9d8..2b1e89bb8cb 100644
--- a/src/mame/drivers/legionna.cpp
+++ b/src/mame/drivers/legionna.cpp
@@ -1228,15 +1228,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(legionna_state::legionna)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
- MCFG_CPU_PROGRAM_MAP(legionna_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000,20000000/2) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(legionna_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1248,9 +1248,9 @@ MACHINE_CONFIG_START(legionna_state::legionna)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", legionna)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16)
@@ -1261,8 +1261,8 @@ MACHINE_CONFIG_START(legionna_state::legionna)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/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", 1320000, PIN7_LOW)
@@ -1271,23 +1271,23 @@ MACHINE_CONFIG_START(legionna_state::legionna)
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(legionna_state::heatbrl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
- MCFG_CPU_PROGRAM_MAP(heatbrl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000,20000000/2) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(heatbrl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1299,9 +1299,9 @@ MACHINE_CONFIG_START(legionna_state::heatbrl)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", heatbrl)
@@ -1314,8 +1314,8 @@ MACHINE_CONFIG_START(legionna_state::heatbrl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/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", 1320000, PIN7_LOW)
@@ -1324,23 +1324,23 @@ MACHINE_CONFIG_START(legionna_state::heatbrl)
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(legionna_state::godzilla)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
- MCFG_CPU_PROGRAM_MAP(godzilla_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(godzilla_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
- MCFG_CPU_IO_MAP(godzilla_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_IO_MAP(godzilla_sound_io_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1353,10 +1353,10 @@ MACHINE_CONFIG_START(legionna_state::godzilla)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_BASE_CB(WRITE16(legionna_state, tile_scroll_base_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_BASE_CB(WRITE16(*this, legionna_state, tile_scroll_base_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", heatbrl)
@@ -1369,7 +1369,7 @@ MACHINE_CONFIG_START(legionna_state::godzilla)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", 14318180/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -1379,22 +1379,22 @@ MACHINE_CONFIG_START(legionna_state::godzilla)
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", ym2151_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(legionna_state::denjinmk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
- MCFG_CPU_PROGRAM_MAP(denjinmk_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(denjinmk_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1408,9 +1408,9 @@ MACHINE_CONFIG_START(legionna_state::denjinmk)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", heatbrl)
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16)
@@ -1422,7 +1422,7 @@ MACHINE_CONFIG_START(legionna_state::denjinmk)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", 14318180/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -1432,22 +1432,22 @@ MACHINE_CONFIG_START(legionna_state::denjinmk)
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", ym2151_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(legionna_state::grainbow)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
- MCFG_CPU_PROGRAM_MAP(grainbow_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(grainbow_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1459,9 +1459,9 @@ MACHINE_CONFIG_START(legionna_state::grainbow)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", grainbow)
@@ -1475,7 +1475,7 @@ MACHINE_CONFIG_START(legionna_state::grainbow)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", 14318180/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -1485,23 +1485,23 @@ MACHINE_CONFIG_START(legionna_state::grainbow)
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", ym2151_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(legionna_state::cupsoc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,20000000/2)
- MCFG_CPU_PROGRAM_MAP(cupsoc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000,20000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(cupsoc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1513,9 +1513,9 @@ MACHINE_CONFIG_START(legionna_state::cupsoc)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cupsoc)
@@ -1528,8 +1528,8 @@ MACHINE_CONFIG_START(legionna_state::cupsoc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/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", 1320000, PIN7_LOW)
@@ -1538,14 +1538,14 @@ MACHINE_CONFIG_START(legionna_state::cupsoc)
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(legionna_state::cupsocs)
cupsoc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cupsocs_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cupsocs_map)
MACHINE_CONFIG_END
/***************************************************************************