diff options
Diffstat (limited to 'src/mame/drivers/fitfight.cpp')
-rw-r--r-- | src/mame/drivers/fitfight.cpp | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp index 6db1ba3f3ff..a75e86a61fc 100644 --- a/src/mame/drivers/fitfight.cpp +++ b/src/mame/drivers/fitfight.cpp @@ -720,11 +720,11 @@ void fitfight_state::machine_reset() m_fof_700000_data = 0; } -MACHINE_CONFIG_START(fitfight_state::fitfight) - - MCFG_DEVICE_ADD("maincpu",M68000, 12000000) - MCFG_DEVICE_PROGRAM_MAP(fitfight_main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fitfight_state, irq2_line_hold) +void fitfight_state::fitfight(machine_config &config) +{ + M68000(config, m_maincpu, 12000000); + m_maincpu->set_addrmap(AS_PROGRAM, &fitfight_state::fitfight_main_map); + m_maincpu->set_vblank_int("screen", FUNC(fitfight_state::irq2_line_hold)); upd7810_device &audiocpu(UPD7810(config, m_audiocpu, 12000000)); audiocpu.set_addrmap(AS_PROGRAM, &fitfight_state::snd_mem); @@ -750,33 +750,31 @@ MACHINE_CONFIG_START(fitfight_state::fitfight) SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("oki", OKIM6295, 1333333, okim6295_device::PIN7_LOW) // ~8080Hz ??? TODO: find out the real frequency - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(fitfight_state::bbprot) + OKIM6295(config, "oki", 1333333, okim6295_device::PIN7_LOW).add_route(ALL_OUTPUTS, "mono", 1.0); // ~8080Hz ??? TODO: find out the real frequency +} - MCFG_DEVICE_ADD("maincpu",M68000, 12000000) - MCFG_DEVICE_PROGRAM_MAP(bbprot_main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fitfight_state, irq2_line_hold) +void fitfight_state::bbprot(machine_config &config) +{ + M68000(config, m_maincpu, 12000000); + m_maincpu->set_addrmap(AS_PROGRAM, &fitfight_state::bbprot_main_map); + m_maincpu->set_vblank_int("screen", FUNC(fitfight_state::irq2_line_hold)); GFXDECODE(config, m_gfxdecode, m_palette, gfx_prot); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(40*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(2*8, 39*8-1, 2*8, 30*8-1) - MCFG_SCREEN_UPDATE_DRIVER(fitfight_state, screen_update_fitfight) - MCFG_SCREEN_PALETTE("palette") + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_refresh_hz(60); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(0)); + screen.set_size(40*8, 32*8); + screen.set_visarea(2*8, 39*8-1, 2*8, 30*8-1); + screen.set_screen_update(FUNC(fitfight_state::screen_update_fitfight)); + screen.set_palette(m_palette); PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 0x2000); SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("oki", OKIM6295, 1333333, okim6295_device::PIN7_LOW) // ~8080Hz ??? TODO: find out the real frequency - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) -MACHINE_CONFIG_END + OKIM6295(config, "oki", 1333333, okim6295_device::PIN7_LOW).add_route(ALL_OUTPUTS, "mono", 1.0); // ~8080Hz ??? TODO: find out the real frequency +} /*** |