summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/applix.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/applix.cpp')
-rw-r--r--src/mame/drivers/applix.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index d4f95115a9e..fd82b97630f 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -844,20 +844,20 @@ TIMER_DEVICE_CALLBACK_MEMBER(applix_state::cass_timer)
MACHINE_CONFIG_START(applix_state::applix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(30'000'000) / 4) // MC68000-P10 @ 7.5 MHz
- MCFG_CPU_PROGRAM_MAP(applix_mem)
- MCFG_CPU_ADD("subcpu", Z80, XTAL(16'000'000) / 2) // Z80H
- MCFG_CPU_PROGRAM_MAP(subcpu_mem)
- MCFG_CPU_IO_MAP(subcpu_io)
- MCFG_CPU_ADD("kbdcpu", I8051, 11060250)
- MCFG_CPU_PROGRAM_MAP(keytronic_pc3270_program)
- MCFG_CPU_IO_MAP(keytronic_pc3270_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(applix_state, p1_read))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(applix_state, p1_write))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(applix_state, p2_read))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(applix_state, p2_write))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(applix_state, p3_read))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(applix_state, p3_write))
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(30'000'000) / 4) // MC68000-P10 @ 7.5 MHz
+ MCFG_DEVICE_PROGRAM_MAP(applix_mem)
+ MCFG_DEVICE_ADD("subcpu", Z80, XTAL(16'000'000) / 2) // Z80H
+ MCFG_DEVICE_PROGRAM_MAP(subcpu_mem)
+ MCFG_DEVICE_IO_MAP(subcpu_io)
+ MCFG_DEVICE_ADD("kbdcpu", I8051, 11060250)
+ MCFG_DEVICE_PROGRAM_MAP(keytronic_pc3270_program)
+ MCFG_DEVICE_IO_MAP(keytronic_pc3270_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, applix_state, p1_read))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, applix_state, p1_write))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, applix_state, p2_read))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, applix_state, p2_write))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, applix_state, p3_read))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, applix_state, p3_write))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -871,8 +871,8 @@ MACHINE_CONFIG_START(applix_state::applix)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC0800, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // 74ls374.u20 + dac0800.u21 + 4052.u23
- MCFG_SOUND_ADD("rdac", DAC0800, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // 74ls374.u20 + dac0800.u21 + 4052.u23
+ MCFG_DEVICE_ADD("ldac", DAC0800, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // 74ls374.u20 + dac0800.u21 + 4052.u23
+ MCFG_DEVICE_ADD("rdac", DAC0800, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // 74ls374.u20 + dac0800.u21 + 4052.u23
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -885,20 +885,20 @@ MACHINE_CONFIG_START(applix_state::applix)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(applix_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(applix_state, vsync_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, applix_state, vsync_w))
MCFG_DEVICE_ADD("via6522", VIA6522, XTAL(30'000'000) / 4 / 10) // VIA uses 68000 E clock
- MCFG_VIA6522_READPB_HANDLER(READ8(applix_state, applix_pb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, applix_state, applix_pb_r))
// in CB1 kbd clk
// in CA2 vsync
// in CB2 kdb data
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(applix_state, applix_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(applix_state, applix_pb_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, applix_state, applix_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, applix_state, applix_pb_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522", via6522_device, write_ca1))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("via6522", via6522_device, write_pa0))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522", via6522_device, write_ca1))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("via6522", via6522_device, write_pa0))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")