diff options
Diffstat (limited to 'src/mame/drivers/crimfght.cpp')
-rw-r--r-- | src/mame/drivers/crimfght.cpp | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp index bd7283b902f..4537003ea74 100644 --- a/src/mame/drivers/crimfght.cpp +++ b/src/mame/drivers/crimfght.cpp @@ -18,7 +18,6 @@ #include "includes/crimfght.h" #include "cpu/z80/z80.h" -#include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */ #include "machine/watchdog.h" #include "sound/ym2151.h" #include "speaker.h" @@ -300,32 +299,32 @@ CUSTOM_INPUT_MEMBER( crimfght_state::system_r ) return data >> 4; } -MACHINE_CONFIG_START(crimfght_state::crimfght) - +void crimfght_state::crimfght(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) /* 052001 (verified on pcb) */ - MCFG_DEVICE_PROGRAM_MAP(crimfght_map) - MCFG_KONAMICPU_LINE_CB(WRITE8(*this, crimfght_state, banking_callback)) + KONAMI(config, m_maincpu, XTAL(24'000'000)/8); /* 052001 (verified on pcb) */ + m_maincpu->set_addrmap(AS_PROGRAM, &crimfght_state::crimfght_map); + m_maincpu->line().set(FUNC(crimfght_state::banking_callback)); - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */ - MCFG_DEVICE_PROGRAM_MAP(crimfght_sound_map) - MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, crimfght_state, audiocpu_irq_ack) + Z80(config, m_audiocpu, XTAL(3'579'545)); /* verified on pcb */ + m_audiocpu->set_addrmap(AS_PROGRAM, &crimfght_state::crimfght_sound_map); + m_audiocpu->set_irq_acknowledge_callback(FUNC(crimfght_state::audiocpu_irq_ack)); ADDRESS_MAP_BANK(config, "bank0000").set_map(&crimfght_state::bank0000_map).set_options(ENDIANNESS_BIG, 8, 11, 0x400); WATCHDOG_TIMER(config, "watchdog"); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 96, 416, 256, 16, 240) // measured 59.17 + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_raw(XTAL(24'000'000)/3, 528, 96, 416, 256, 16, 240); // measured 59.17 // 6MHz dotclock is more realistic, however needs drawing updates. replace when ready -// MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240) - MCFG_SCREEN_UPDATE_DRIVER(crimfght_state, screen_update_crimfght) - MCFG_SCREEN_PALETTE("palette") +// screen.set_raw(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240); + screen.set_screen_update(FUNC(crimfght_state::screen_update_crimfght)); + screen.set_palette(m_palette); - MCFG_PALETTE_ADD("palette", 512) - MCFG_PALETTE_ENABLE_SHADOWS() - MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) + PALETTE(config, m_palette, 512); + m_palette->enable_shadows(); + m_palette->set_format(PALETTE_FORMAT_xBBBBBGGGGGRRRRR); K052109(config, m_k052109, 0); m_k052109->set_palette(m_palette); @@ -348,13 +347,13 @@ MACHINE_CONFIG_START(crimfght_state::crimfght) ymsnd.add_route(0, "lspeaker", 1.0); ymsnd.add_route(1, "rspeaker", 1.0); - MCFG_DEVICE_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */ - MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, crimfght_state, volume_callback)) - MCFG_SOUND_ROUTE(0, "lspeaker", 0.20) - MCFG_SOUND_ROUTE(0, "rspeaker", 0.20) - MCFG_SOUND_ROUTE(1, "lspeaker", 0.20) - MCFG_SOUND_ROUTE(1, "rspeaker", 0.20) -MACHINE_CONFIG_END + K007232(config, m_k007232, XTAL(3'579'545)); /* verified on pcb */ + m_k007232->port_write().set(FUNC(crimfght_state::volume_callback)); + m_k007232->add_route(0, "lspeaker", 0.20); + m_k007232->add_route(0, "rspeaker", 0.20); + m_k007232->add_route(1, "lspeaker", 0.20); + m_k007232->add_route(1, "rspeaker", 0.20); +} /*************************************************************************** |