diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/esh.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/esh.cpp')
-rw-r--r-- | src/mame/drivers/esh.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp index 6fb6c3f2f08..4137a8e7b12 100644 --- a/src/mame/drivers/esh.cpp +++ b/src/mame/drivers/esh.cpp @@ -361,19 +361,17 @@ void esh_state::machine_start() /* DRIVER */ MACHINE_CONFIG_START(esh_state::esh) /* main cpu */ - Z80(config, m_maincpu, PCB_CLOCK/6); /* The denominator is a Daphne guess based on PacMan's hardware */ - m_maincpu->set_addrmap(AS_PROGRAM, &esh_state::z80_0_mem); - m_maincpu->set_addrmap(AS_IO, &esh_state::z80_0_io); - m_maincpu->set_vblank_int("screen", FUNC(esh_state::vblank_callback_esh)); + MCFG_DEVICE_ADD("maincpu", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */ + MCFG_DEVICE_PROGRAM_MAP(z80_0_mem) + MCFG_DEVICE_IO_MAP(z80_0_io) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", esh_state, vblank_callback_esh) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - PIONEER_LDV1000(config, m_laserdisc, 0); - m_laserdisc->command_strobe_callback().set(FUNC(esh_state::ld_command_strobe_cb)); - m_laserdisc->set_overlay(256, 256, FUNC(esh_state::screen_update_esh)); - m_laserdisc->set_overlay_palette(m_palette); - m_laserdisc->add_route(0, "lspeaker", 1.0); - m_laserdisc->add_route(1, "rspeaker", 1.0); + MCFG_LASERDISC_LDV1000_ADD("laserdisc") + MCFG_LASERDISC_LDV1000_COMMAND_STROBE_CB(WRITELINE(*this, esh_state, ld_command_strobe_cb)) + MCFG_LASERDISC_OVERLAY_DRIVER(256, 256, esh_state, screen_update_esh) + MCFG_LASERDISC_OVERLAY_PALETTE(m_palette) /* video hardware */ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc") @@ -385,8 +383,12 @@ MACHINE_CONFIG_START(esh_state::esh) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); + MCFG_DEVICE_MODIFY("laserdisc") + MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) SPEAKER(config, "mono").front_center(); - BEEP(config, m_beep, 2000).add_route(ALL_OUTPUTS, "mono", 0.25); + MCFG_DEVICE_ADD("beeper", BEEP, 2000) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END // we just disable even lines so we can simulate line blinking |