diff options
Diffstat (limited to 'src/mame/drivers/amspdwy.cpp')
-rw-r--r-- | src/mame/drivers/amspdwy.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp index 373b1e92627..6e5d3fd4e4c 100644 --- a/src/mame/drivers/amspdwy.cpp +++ b/src/mame/drivers/amspdwy.cpp @@ -68,7 +68,7 @@ READ8_MEMBER(amspdwy_state::amspdwy_wheel_1_r) READ8_MEMBER(amspdwy_state::amspdwy_sound_r) { - return (m_ym2151->status_r() & ~0x30) | ioport("IN0")->read(); + return (m_ym2151->status_r(space, 0) & ~0x30) | ioport("IN0")->read(); } void amspdwy_state::amspdwy_map(address_map &map) @@ -247,27 +247,27 @@ void amspdwy_state::machine_reset() m_wheel_return[1] = 0; } -void amspdwy_state::amspdwy(machine_config &config) -{ +MACHINE_CONFIG_START(amspdwy_state::amspdwy) + /* basic machine hardware */ - Z80(config, m_maincpu, 3000000); - m_maincpu->set_addrmap(AS_PROGRAM, &amspdwy_state::amspdwy_map); - m_maincpu->set_addrmap(AS_IO, &amspdwy_state::amspdwy_portmap); - m_maincpu->set_vblank_int("screen", FUNC(amspdwy_state::irq0_line_hold)); /* IRQ: 60Hz, NMI: retn */ + MCFG_DEVICE_ADD("maincpu", Z80, 3000000) + MCFG_DEVICE_PROGRAM_MAP(amspdwy_map) + MCFG_DEVICE_IO_MAP(amspdwy_portmap) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", amspdwy_state, irq0_line_hold) /* IRQ: 60Hz, NMI: retn */ - Z80(config, m_audiocpu, 3000000); - m_audiocpu->set_addrmap(AS_PROGRAM, &amspdwy_state::amspdwy_sound_map); + MCFG_DEVICE_ADD("audiocpu", Z80, 3000000) + MCFG_DEVICE_PROGRAM_MAP(amspdwy_sound_map) - config.m_perfect_cpu_quantum = subtag("maincpu"); + MCFG_QUANTUM_PERFECT_CPU("maincpu") /* video hardware */ - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(256, 256); - m_screen->set_visarea(0, 256-1, 0+16, 256-16-1); - m_screen->set_screen_update(FUNC(amspdwy_state::screen_update_amspdwy)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(256, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1) + MCFG_SCREEN_UPDATE_DRIVER(amspdwy_state, screen_update_amspdwy) + MCFG_SCREEN_PALETTE(m_palette) GFXDECODE(config, m_gfxdecode, m_palette, gfx_amspdwy); PALETTE(config, m_palette).set_format(palette_device::BGR_233_inverted, 32); @@ -283,7 +283,7 @@ void amspdwy_state::amspdwy(machine_config &config) m_ym2151->irq_handler().set_inputline(m_audiocpu, 0); m_ym2151->add_route(0, "lspeaker", 1.0); m_ym2151->add_route(1, "rspeaker", 1.0); -} +MACHINE_CONFIG_END |