diff options
Diffstat (limited to 'src/mame/drivers/mikie.cpp')
-rw-r--r-- | src/mame/drivers/mikie.cpp | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp index a8b8cbd3842..3b8c548fdba 100644 --- a/src/mame/drivers/mikie.cpp +++ b/src/mame/drivers/mikie.cpp @@ -132,9 +132,9 @@ void mikie_state::sound_map(address_map &map) map(0x4000, 0x43ff).ram(); map(0x8000, 0x8000).nopw(); // sound command latch map(0x8001, 0x8001).nopw(); // ??? - map(0x8002, 0x8002).w("sn1", FUNC(sn76489a_device::write)); // trigger read of latch + map(0x8002, 0x8002).w("sn1", FUNC(sn76489a_device::command_w)); // trigger read of latch map(0x8003, 0x8003).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x8004, 0x8004).w("sn2", FUNC(sn76489a_device::write)); // trigger read of latch + map(0x8004, 0x8004).w("sn2", FUNC(sn76489a_device::command_w)); // trigger read of latch map(0x8005, 0x8005).r(FUNC(mikie_state::mikie_sh_timer_r)); map(0x8079, 0x8079).nopw(); // ??? map(0xa003, 0xa003).nopw(); // ??? @@ -258,14 +258,14 @@ WRITE_LINE_MEMBER(mikie_state::vblank_irq) m_maincpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); } -void mikie_state::mikie(machine_config &config) -{ +MACHINE_CONFIG_START(mikie_state::mikie) + /* basic machine hardware */ - MC6809E(config, m_maincpu, OSC/12); // 9A (surface scratched) - m_maincpu->set_addrmap(AS_PROGRAM, &mikie_state::mikie_map); + MCFG_DEVICE_ADD("maincpu", MC6809E, OSC/12) // 9A (surface scratched) + MCFG_DEVICE_PROGRAM_MAP(mikie_map) - Z80(config, m_audiocpu, CLK); // 4E (surface scratched) - m_audiocpu->set_addrmap(AS_PROGRAM, &mikie_state::sound_map); + MCFG_DEVICE_ADD("audiocpu", Z80, CLK) // 4E (surface scratched) + MCFG_DEVICE_PROGRAM_MAP(sound_map) ls259_device &mainlatch(LS259(config, "mainlatch")); // 6I mainlatch.q_out_cb<0>().set(FUNC(mikie_state::coin_counter_1_w)); // COIN1 @@ -278,14 +278,14 @@ void mikie_state::mikie(machine_config &config) WATCHDOG_TIMER(config, "watchdog"); /* video hardware */ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(60.59); - screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); - screen.set_size(32*8, 32*8); - screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1); - screen.set_screen_update(FUNC(mikie_state::screen_update_mikie)); - screen.set_palette(m_palette); - screen.screen_vblank().set(FUNC(mikie_state::vblank_irq)); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60.59) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(32*8, 32*8) + MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) + MCFG_SCREEN_UPDATE_DRIVER(mikie_state, screen_update_mikie) + MCFG_SCREEN_PALETTE(m_palette) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mikie_state, vblank_irq)) GFXDECODE(config, m_gfxdecode, m_palette, gfx_mikie); PALETTE(config, m_palette, FUNC(mikie_state::mikie_palette), 16*8*16+16*8*16, 256); @@ -295,10 +295,12 @@ void mikie_state::mikie(machine_config &config) GENERIC_LATCH_8(config, "soundlatch"); - SN76489A(config, "sn1", XTAL/8).add_route(ALL_OUTPUTS, "mono", 0.60); + MCFG_DEVICE_ADD("sn1", SN76489A, XTAL/8) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) - SN76489A(config, "sn2", CLK).add_route(ALL_OUTPUTS, "mono", 0.60); -} + MCFG_DEVICE_ADD("sn2", SN76489A, CLK) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) +MACHINE_CONFIG_END /************************************* * |