summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/apricotf.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/apricotf.cpp')
-rw-r--r--src/mame/drivers/apricotf.cpp45
1 files changed, 23 insertions, 22 deletions
diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp
index ceffb12675d..93ec038ba5d 100644
--- a/src/mame/drivers/apricotf.cpp
+++ b/src/mame/drivers/apricotf.cpp
@@ -342,29 +342,29 @@ void apricotf_floppies(device_slot_interface &device)
//**************************************************************************
//-------------------------------------------------
-// MACHINE_CONFIG( act_f1 )
+// machine_config( act_f1 )
//-------------------------------------------------
-MACHINE_CONFIG_START(f1_state::act_f1)
+void f1_state::act_f1(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD(I8086_TAG, I8086, 14_MHz_XTAL / 4)
- MCFG_DEVICE_PROGRAM_MAP(act_f1_mem)
- MCFG_DEVICE_IO_MAP(act_f1_io)
+ I8086(config, m_maincpu, 14_MHz_XTAL / 4);
+ m_maincpu->set_addrmap(AS_PROGRAM, &f1_state::act_f1_mem);
+ m_maincpu->set_addrmap(AS_IO, &f1_state::act_f1_io);
- MCFG_INPUT_MERGER_ANY_HIGH("irqs")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0))
+ INPUT_MERGER_ANY_HIGH(config, "irqs").output_handler().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
/* video hardware */
- MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
- MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
- MCFG_SCREEN_UPDATE_DRIVER(f1_state, screen_update)
- MCFG_SCREEN_SIZE(640, 256)
- MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
- MCFG_SCREEN_PALETTE("palette")
+ screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER));
+ screen.set_refresh_hz(50);
+ screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
+ screen.set_screen_update(FUNC(f1_state::screen_update));
+ screen.set_size(640, 256);
+ screen.set_visarea_full();
+ screen.set_palette(m_palette);
- MCFG_PALETTE_ADD("palette", 16)
- MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_act_f1)
+ PALETTE(config, m_palette).set_entries(16);
+ GFXDECODE(config, "gfxdecode", m_palette, gfx_act_f1);
/* Devices */
APRICOT_KEYBOARD(config, APRICOT_KEYBOARD_TAG, 0);
@@ -377,19 +377,20 @@ MACHINE_CONFIG_START(f1_state::act_f1)
m_ctc->zc_callback<1>().set(FUNC(f1_state::ctc_z1_w));
m_ctc->zc_callback<2>().set(FUNC(f1_state::ctc_z2_w));
- MCFG_DEVICE_ADD(m_centronics, CENTRONICS, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(m_sio, z80sio_device, ctsa_w))
+ CENTRONICS(config, m_centronics, centronics_devices, "printer");
+ m_centronics->busy_handler().set(m_sio, FUNC(z80sio_device::ctsa_w));
- MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
+ OUTPUT_LATCH(config, m_cent_data_out);
+ m_centronics->set_output_latch(*m_cent_data_out);
// floppy
WD2797(config, m_fdc, 4_MHz_XTAL / 2 /* ? */);
m_fdc->intrq_wr_callback().set_inputline(m_maincpu, INPUT_LINE_NMI);
m_fdc->drq_wr_callback().set_inputline(m_maincpu, INPUT_LINE_TEST);
- MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":0", apricotf_floppies, "d32w", f1_state::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":1", apricotf_floppies, "d32w", f1_state::floppy_formats)
-MACHINE_CONFIG_END
+ FLOPPY_CONNECTOR(config, WD2797_TAG ":0", apricotf_floppies, "d32w", f1_state::floppy_formats);
+ FLOPPY_CONNECTOR(config, WD2797_TAG ":1", apricotf_floppies, "d32w", f1_state::floppy_formats);
+}