diff options
Diffstat (limited to 'src/mame/drivers/jclub2.cpp')
-rw-r--r-- | src/mame/drivers/jclub2.cpp | 98 |
1 files changed, 50 insertions, 48 deletions
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index 57dc4d26b5d..b5720c16a48 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -1131,31 +1131,32 @@ TIMER_DEVICE_CALLBACK_MEMBER(common_state::scanline_irq) } // Older hardware (ST-0020 + ST-0016) -MACHINE_CONFIG_START(jclub2o_state::jclub2o) - MCFG_DEVICE_ADD("maincpu", M68EC020, 12000000) - MCFG_DEVICE_PROGRAM_MAP(jclub2o_map) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1) +void jclub2o_state::jclub2o(machine_config &config) +{ + M68EC020(config, m_maincpu, 12000000); + m_maincpu->set_addrmap(AS_PROGRAM, &jclub2o_state::jclub2o_map); + TIMER(config, "scantimer").configure_scanline(FUNC(common_state::scanline_irq), "screen", 0, 1); - MCFG_DEVICE_ADD("soundcpu",ST0016_CPU, 8000000) - MCFG_DEVICE_PROGRAM_MAP(st0016_mem) - MCFG_DEVICE_IO_MAP(st0016_io) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jclub2o_state, irq0_line_hold) + ST0016_CPU(config, m_soundcpu, 8000000); + m_soundcpu->set_addrmap(AS_PROGRAM, &jclub2o_state::st0016_mem); + m_soundcpu->set_addrmap(AS_IO, &jclub2o_state::st0016_io); + m_soundcpu->set_vblank_int("screen", FUNC(jclub2o_state::irq0_line_hold)); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); EEPROM_S29290_16BIT(config, "eeprom"); WATCHDOG_TIMER(config, "watchdog"); - MCFG_TICKET_DISPENSER_ADD("hopper1", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) - MCFG_TICKET_DISPENSER_ADD("hopper2", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) + TICKET_DISPENSER(config, m_hopper1, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper2, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); // video hardware - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(0x190, 0x100+16) - MCFG_SCREEN_VISIBLE_AREA(0, 0x190-1, 0x10, 0x100-1) - MCFG_SCREEN_UPDATE_DRIVER(jclub2_state, screen_update) - MCFG_SCREEN_PALETTE(m_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(0x190, 0x100+16); + screen.set_visarea(0, 0x190-1, 0x10, 0x100-1); + screen.set_screen_update(FUNC(jclub2_state::screen_update)); + screen.set_palette(m_palette); PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x10000); @@ -1165,30 +1166,31 @@ MACHINE_CONFIG_START(jclub2o_state::jclub2o) // layout config.set_default_layout(layout_jclub2o); -MACHINE_CONFIG_END +} // Newer hardware (ST-0032) -MACHINE_CONFIG_START(jclub2_state::jclub2) - MCFG_DEVICE_ADD("maincpu", M68EC020, 12000000) - MCFG_DEVICE_PROGRAM_MAP(jclub2_map) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1) +void jclub2_state::jclub2(machine_config &config) +{ + M68EC020(config, m_maincpu, 12000000); + m_maincpu->set_addrmap(AS_PROGRAM, &jclub2_state::jclub2_map); + TIMER(config, "scantimer").configure_scanline(FUNC(common_state::scanline_irq), "screen", 0, 1); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); EEPROM_93C46_8BIT(config, "eeprom"); WATCHDOG_TIMER(config, "watchdog"); - MCFG_TICKET_DISPENSER_ADD("hopper1", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) - MCFG_TICKET_DISPENSER_ADD("hopper2", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) + TICKET_DISPENSER(config, m_hopper1, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper2, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); // video hardware - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(0x190, 0x100+16) - MCFG_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-8-1) - MCFG_SCREEN_UPDATE_DRIVER(jclub2_state, screen_update) - MCFG_SCREEN_PALETTE(m_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(0x190, 0x100+16); + screen.set_visarea(0, 0x190-1, 8, 0x100-8-1); + screen.set_screen_update(FUNC(jclub2_state::screen_update)); + screen.set_palette(m_palette); PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x10000); @@ -1200,29 +1202,30 @@ MACHINE_CONFIG_START(jclub2_state::jclub2) // layout config.set_default_layout(layout_jclub2o); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(darkhors_state::darkhors) - MCFG_DEVICE_ADD("maincpu", M68EC020, 12000000) // 36MHz/3 ?? - MCFG_DEVICE_PROGRAM_MAP(darkhors_map) - MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1) +void darkhors_state::darkhors(machine_config &config) +{ + M68EC020(config, m_maincpu, 12000000); // 36MHz/3 ?? + m_maincpu->set_addrmap(AS_PROGRAM, &darkhors_state::darkhors_map); + TIMER(config, "scantimer").configure_scanline(FUNC(common_state::scanline_irq), "screen", 0, 1); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); EEPROM_93C46_8BIT(config, "eeprom"); WATCHDOG_TIMER(config, "watchdog"); - MCFG_TICKET_DISPENSER_ADD("hopper1", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) - MCFG_TICKET_DISPENSER_ADD("hopper2", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH) + TICKET_DISPENSER(config, m_hopper1, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_hopper2, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH); // video hardware - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(0x190, 0x100+16) - MCFG_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-8-1) - MCFG_SCREEN_UPDATE_DRIVER(darkhors_state, screen_update) - MCFG_SCREEN_PALETTE(m_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(0x190, 0x100+16); + screen.set_visarea(0, 0x190-1, 8, 0x100-8-1); + screen.set_screen_update(FUNC(darkhors_state::screen_update)); + screen.set_palette(m_palette); PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x10000); @@ -1235,9 +1238,8 @@ MACHINE_CONFIG_START(darkhors_state::darkhors) // sound hardware SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("oki", OKIM6295, 528000, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) -MACHINE_CONFIG_END + OKIM6295(config, "oki", 528000, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.0); // clock frequency & pin 7 not verified +} /*************************************************************************** |