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/orbit.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/orbit.cpp')
-rw-r--r-- | src/mame/drivers/orbit.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp index 1cd1a45117e..41097621386 100644 --- a/src/mame/drivers/orbit.cpp +++ b/src/mame/drivers/orbit.cpp @@ -265,14 +265,14 @@ void orbit_state::machine_reset() * *************************************/ -void orbit_state::orbit(machine_config &config) -{ +MACHINE_CONFIG_START(orbit_state::orbit) + /* basic machine hardware */ - M6800(config, m_maincpu, MASTER_CLOCK / 16); - m_maincpu->set_addrmap(AS_PROGRAM, &orbit_state::main_map); - m_maincpu->set_vblank_int("screen", FUNC(orbit_state::interrupt)); + MCFG_DEVICE_ADD(m_maincpu, M6800, MASTER_CLOCK / 16) + MCFG_DEVICE_PROGRAM_MAP(main_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", orbit_state, interrupt) - TIMER(config, "32v").configure_scanline(FUNC(orbit_state::nmi_32v), "screen", 0, 32); + MCFG_TIMER_DRIVER_ADD_SCANLINE("32v", orbit_state, nmi_32v, "screen", 0, 32) F9334(config, m_latch); // M6 /* BIT0 => UNUSED */ @@ -291,12 +291,12 @@ void orbit_state::orbit(machine_config &config) WATCHDOG_TIMER(config, "watchdog"); /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(MASTER_CLOCK*2, 384*2, 0, 256*2, 261*2, 0, 240*2); - m_screen->set_screen_update(FUNC(orbit_state::screen_update)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD(m_screen, RASTER) + MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2, 384*2, 0, 256*2, 261*2, 0, 240*2) + MCFG_SCREEN_UPDATE_DRIVER(orbit_state, screen_update) + MCFG_SCREEN_PALETTE(m_palette) - GFXDECODE(config, m_gfxdecode, m_palette, gfx_orbit); + MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_palette, gfx_orbit) PALETTE(config, m_palette, palette_device::MONOCHROME); @@ -304,10 +304,10 @@ void orbit_state::orbit(machine_config &config) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - DISCRETE(config, m_discrete, orbit_discrete); - m_discrete->add_route(0, "lspeaker", 1.0); - m_discrete->add_route(1, "rspeaker", 1.0); -} + MCFG_DEVICE_ADD(m_discrete, DISCRETE, orbit_discrete) + MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) +MACHINE_CONFIG_END |