diff options
Diffstat (limited to 'src/mame/drivers/canyon.cpp')
-rw-r--r-- | src/mame/drivers/canyon.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp index 340b7c3e99d..22e5d3b0822 100644 --- a/src/mame/drivers/canyon.cpp +++ b/src/mame/drivers/canyon.cpp @@ -239,11 +239,11 @@ GFXDECODE_END * *************************************/ -MACHINE_CONFIG_START(canyon_state::canyon) - +void canyon_state::canyon(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M6502, 12.096_MHz_XTAL / 16) - MCFG_DEVICE_PROGRAM_MAP(main_map) + M6502(config, m_maincpu, 12.096_MHz_XTAL / 16); + m_maincpu->set_addrmap(AS_PROGRAM, &canyon_state::main_map); F9334(config, m_outlatch); // C7 m_outlatch->q_out_cb<0>().set("discrete", FUNC(discrete_device::write_line<CANYON_WHISTLE1_EN>)); @@ -256,11 +256,11 @@ MACHINE_CONFIG_START(canyon_state::canyon) WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 8); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(12.096_MHz_XTAL / 2, 384, 0, 256, 262, 0, 240) // HSYNC = 15,750 Hz - MCFG_SCREEN_UPDATE_DRIVER(canyon_state, screen_update_canyon) - MCFG_SCREEN_PALETTE(m_palette) - MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", m6502_device::NMI_LINE)) + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_raw(12.096_MHz_XTAL / 2, 384, 0, 256, 262, 0, 240); // HSYNC = 15,750 Hz + screen.set_screen_update(FUNC(canyon_state::screen_update_canyon)); + screen.set_palette(m_palette); + screen.screen_vblank().set_inputline(m_maincpu, m6502_device::NMI_LINE); GFXDECODE(config, m_gfxdecode, m_palette, gfx_canyon); PALETTE(config, m_palette, FUNC(canyon_state::canyon_palette), 4); @@ -269,10 +269,10 @@ MACHINE_CONFIG_START(canyon_state::canyon) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_DEVICE_ADD("discrete", DISCRETE, canyon_discrete) - MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) -MACHINE_CONFIG_END + DISCRETE(config, m_discrete, canyon_discrete); + m_discrete->add_route(0, "lspeaker", 1.0); + m_discrete->add_route(1, "rspeaker", 1.0); +} |