summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/wildpkr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/wildpkr.cpp')
-rw-r--r--src/mame/drivers/wildpkr.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp
index 750e5431ecd..50380cfd46e 100644
--- a/src/mame/drivers/wildpkr.cpp
+++ b/src/mame/drivers/wildpkr.cpp
@@ -465,22 +465,22 @@ IRQ_CALLBACK_MEMBER(wildpkr_state::tabpkr_irq_ack)
* Machine Drivers *
*************************/
-MACHINE_CONFIG_START(wildpkr_state::wildpkr)
-
+void wildpkr_state::wildpkr(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", M68000, MAIN_CLOCK)
- MCFG_DEVICE_PROGRAM_MAP(wildpkr_map)
- //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wildpkr_state, irq2_line_hold) // guess
+ M68000(config, m_maincpu, MAIN_CLOCK);
+ m_maincpu->set_addrmap(AS_PROGRAM, &wildpkr_state::wildpkr_map);
+ //m_maincpu->set_vblank_int("screen", FUNC(wildpkr_state::irq2_line_hold)); // guess
MC68681(config, m_duart, SEC_CLOCK);
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
- MCFG_SCREEN_SIZE(384, 280)
- MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1)
- MCFG_SCREEN_UPDATE_DEVICE("acrtc", hd63484_device, update_screen)
- 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(2500));
+ screen.set_size(384, 280);
+ screen.set_visarea(0, 384-1, 0, 280-1);
+ screen.set_screen_update("acrtc", FUNC(hd63484_device::update_screen));
+ screen.set_palette("palette");
HD63484(config, "acrtc", 0).set_addrmap(0, &wildpkr_state::hd63484_map);
@@ -492,16 +492,16 @@ MACHINE_CONFIG_START(wildpkr_state::wildpkr)
/* sound hardware */
SPEAKER(config, "mono").front_center();
AY8930(config, "aysnd", AY_CLOCK).add_route(ALL_OUTPUTS, "mono", 0.50);
-MACHINE_CONFIG_END
-
+}
-MACHINE_CONFIG_START(wildpkr_state::tabpkr)
+void wildpkr_state::tabpkr(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
- MCFG_DEVICE_PROGRAM_MAP(tabpkr_map)
- MCFG_DEVICE_PERIODIC_INT_DRIVER(wildpkr_state, irq3_line_assert, 60*256)
- MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(wildpkr_state, tabpkr_irq_ack)
+ M68000(config, m_maincpu, XTAL(24'000'000) / 2);
+ m_maincpu->set_addrmap(AS_PROGRAM, &wildpkr_state::tabpkr_map);
+ m_maincpu->set_periodic_int(FUNC(wildpkr_state::irq3_line_assert), attotime::from_hz(60*256));
+ m_maincpu->set_irq_acknowledge_callback(FUNC(wildpkr_state::tabpkr_irq_ack));
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); // DS1220Y
@@ -513,14 +513,14 @@ MACHINE_CONFIG_START(wildpkr_state::tabpkr)
CLOCK(config, m_dac_clock, 1500000); // base rate derived from program code
m_dac_clock->signal_handler().set_inputline(m_maincpu, M68K_IRQ_5, ASSERT_LINE);
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
- MCFG_SCREEN_SIZE(384, 280)
- MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1)
- MCFG_SCREEN_UPDATE_DEVICE("acrtc", hd63484_device, update_screen)
- MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(ASSERTLINE("maincpu", M68K_IRQ_4))
+ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+ screen.set_refresh_hz(60);
+ screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500));
+ screen.set_size(384, 280);
+ screen.set_visarea(0, 384-1, 0, 280-1);
+ screen.set_screen_update("acrtc", FUNC(hd63484_device::update_screen));
+ screen.set_palette("palette");
+ screen.screen_vblank().set_inputline(m_maincpu, M68K_IRQ_4, ASSERT_LINE);
HD63484(config, "acrtc", 0).set_addrmap(0, &wildpkr_state::hd63484_map);
@@ -536,7 +536,7 @@ MACHINE_CONFIG_START(wildpkr_state::tabpkr)
vref.set_output(5.0);
vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
-MACHINE_CONFIG_END
+}
/*************************