diff options
Diffstat (limited to 'src/mame/drivers/kyocera.cpp')
-rw-r--r-- | src/mame/drivers/kyocera.cpp | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp index 75db227e023..d6875a0d666 100644 --- a/src/mame/drivers/kyocera.cpp +++ b/src/mame/drivers/kyocera.cpp @@ -1348,37 +1348,37 @@ TIMER_DEVICE_CALLBACK_MEMBER(tandy200_state::tandy200_tp_tick) MACHINE_CONFIG_START(kc85_state::kc85) /* basic machine hardware */ - MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200)) - MCFG_CPU_PROGRAM_MAP(kc85_mem) - MCFG_CPU_IO_MAP(kc85_io) - MCFG_I8085A_SID(READLINE(kc85_state,kc85_sid_r)) - MCFG_I8085A_SOD(WRITELINE(kc85_state,kc85_sod_w)) + MCFG_DEVICE_ADD(I8085_TAG, I8085A, XTAL(4'915'200)) + MCFG_DEVICE_PROGRAM_MAP(kc85_mem) + MCFG_DEVICE_IO_MAP(kc85_io) + MCFG_I8085A_SID(READLINE(*this, kc85_state,kc85_sid_r)) + MCFG_I8085A_SOD(WRITELINE(*this, kc85_state,kc85_sod_w)) /* video hardware */ kc85_video(config); /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* devices */ MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2) - MCFG_I8155_OUT_PORTA_CB(WRITE8(kc85_state, i8155_pa_w)) - MCFG_I8155_OUT_PORTB_CB(WRITE8(kc85_state, i8155_pb_w)) - MCFG_I8155_IN_PORTC_CB(READ8(kc85_state, i8155_pc_r)) - MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(kc85_state, i8155_to_w)) + MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, kc85_state, i8155_pa_w)) + MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, kc85_state, i8155_pb_w)) + MCFG_I8155_IN_PORTC_CB(READ8(*this, kc85_state, i8155_pc_r)) + MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, kc85_state, i8155_to_w)) MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE)) MCFG_IM6402_ADD(IM6402_TAG, 0, 0) - MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IM6402_TAG, im6402_device, write_rri)) + MCFG_IM6402_TRO_CALLBACK(WRITELINE(RS232_TAG, rs232_port_device, write_txd)) + MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(IM6402_TAG, im6402_device, write_rri)) MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(kc85_state, write_centronics_busy)) - MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(kc85_state, write_centronics_select)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, kc85_state, write_centronics_busy)) + MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, kc85_state, write_centronics_select)) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) @@ -1398,37 +1398,37 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(pc8201_state::pc8201) /* basic machine hardware */ - MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200)) - MCFG_CPU_PROGRAM_MAP(pc8201_mem) - MCFG_CPU_IO_MAP(pc8201_io) - MCFG_I8085A_SID(READLINE(kc85_state,kc85_sid_r)) - MCFG_I8085A_SOD(WRITELINE(kc85_state,kc85_sod_w)) + MCFG_DEVICE_ADD(I8085_TAG, I8085A, XTAL(4'915'200)) + MCFG_DEVICE_PROGRAM_MAP(pc8201_mem) + MCFG_DEVICE_IO_MAP(pc8201_io) + MCFG_I8085A_SID(READLINE(*this, kc85_state,kc85_sid_r)) + MCFG_I8085A_SOD(WRITELINE(*this, kc85_state,kc85_sod_w)) /* video hardware */ kc85_video(config); /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* devices */ MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2) - MCFG_I8155_OUT_PORTA_CB(WRITE8(kc85_state, i8155_pa_w)) - MCFG_I8155_OUT_PORTB_CB(WRITE8(kc85_state, i8155_pb_w)) - MCFG_I8155_IN_PORTC_CB(READ8(kc85_state, i8155_pc_r)) - MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(kc85_state, i8155_to_w)) + MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, kc85_state, i8155_pa_w)) + MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, kc85_state, i8155_pb_w)) + MCFG_I8155_IN_PORTC_CB(READ8(*this, kc85_state, i8155_pc_r)) + MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, kc85_state, i8155_to_w)) MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE)) MCFG_IM6402_ADD(IM6402_TAG, 0, 0) - MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IM6402_TAG, im6402_device, write_rri)) + MCFG_IM6402_TRO_CALLBACK(WRITELINE(RS232_TAG, rs232_port_device, write_txd)) + MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(IM6402_TAG, im6402_device, write_rri)) MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(kc85_state, write_centronics_busy)) - MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(kc85_state, write_centronics_select)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, kc85_state, write_centronics_busy)) + MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, kc85_state, write_centronics_select)) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) @@ -1459,33 +1459,33 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(trsm100_state::trsm100) /* basic machine hardware */ - MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200)) - MCFG_CPU_PROGRAM_MAP(kc85_mem) - MCFG_CPU_IO_MAP(trsm100_io) - MCFG_I8085A_SID(READLINE(kc85_state,kc85_sid_r)) - MCFG_I8085A_SOD(WRITELINE(kc85_state,kc85_sod_w)) + MCFG_DEVICE_ADD(I8085_TAG, I8085A, XTAL(4'915'200)) + MCFG_DEVICE_PROGRAM_MAP(kc85_mem) + MCFG_DEVICE_IO_MAP(trsm100_io) + MCFG_I8085A_SID(READLINE(*this, kc85_state,kc85_sid_r)) + MCFG_I8085A_SOD(WRITELINE(*this, kc85_state,kc85_sod_w)) /* video hardware */ kc85_video(config); /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* devices */ MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2) - MCFG_I8155_OUT_PORTA_CB(WRITE8(kc85_state, i8155_pa_w)) - MCFG_I8155_OUT_PORTB_CB(WRITE8(kc85_state, i8155_pb_w)) - MCFG_I8155_IN_PORTC_CB(READ8(kc85_state, i8155_pc_r)) - MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(kc85_state, i8155_to_w)) + MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, kc85_state, i8155_pa_w)) + MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, kc85_state, i8155_pb_w)) + MCFG_I8155_IN_PORTC_CB(READ8(*this, kc85_state, i8155_pc_r)) + MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, kc85_state, i8155_to_w)) MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE)) MCFG_IM6402_ADD(IM6402_TAG, 0, 0) - MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IM6402_TAG, im6402_device, write_rri)) + MCFG_IM6402_TRO_CALLBACK(WRITELINE(RS232_TAG, rs232_port_device, write_txd)) + MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(IM6402_TAG, im6402_device, write_rri)) MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") MCFG_CASSETTE_ADD("cassette") @@ -1515,11 +1515,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(tandy200_state::tandy200) /* basic machine hardware */ - MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200)) - MCFG_CPU_PROGRAM_MAP(tandy200_mem) - MCFG_CPU_IO_MAP(tandy200_io) - MCFG_I8085A_SID(READLINE(tandy200_state,kc85_sid_r)) - MCFG_I8085A_SOD(WRITELINE(tandy200_state,kc85_sod_w)) + MCFG_DEVICE_ADD(I8085_TAG, I8085A, XTAL(4'915'200)) + MCFG_DEVICE_PROGRAM_MAP(tandy200_mem) + MCFG_DEVICE_IO_MAP(tandy200_io) + MCFG_I8085A_SID(READLINE(*this, tandy200_state,kc85_sid_r)) + MCFG_I8085A_SOD(WRITELINE(*this, tandy200_state,kc85_sod_w)) /* video hardware */ tandy200_video(config); @@ -1529,32 +1529,32 @@ MACHINE_CONFIG_START(tandy200_state::tandy200) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // MCFG_TCM5089_ADD(TCM5089_TAG, XTAL(3'579'545)) /* devices */ MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2) - MCFG_I8155_OUT_PORTA_CB(WRITE8(tandy200_state, i8155_pa_w)) - MCFG_I8155_OUT_PORTB_CB(WRITE8(tandy200_state, i8155_pb_w)) - MCFG_I8155_IN_PORTC_CB(READ8(tandy200_state, i8155_pc_r)) - MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(tandy200_state, i8155_to_w)) + MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, tandy200_state, i8155_pa_w)) + MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, tandy200_state, i8155_pb_w)) + MCFG_I8155_IN_PORTC_CB(READ8(*this, tandy200_state, i8155_pc_r)) + MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, tandy200_state, i8155_to_w)) MCFG_DEVICE_ADD(RP5C01A_TAG, RP5C01, XTAL(32'768)) MCFG_DEVICE_ADD(I8251_TAG, I8251, 0) /*XTAL(4'915'200)/2,*/ - MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) - MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr)) - MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts)) + MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd)) + MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr)) + MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts)) - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) + MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd)) + MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr)) // MCFG_MC14412_ADD(MC14412_TAG, XTAL(1'000'000)) MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(tandy200_state, write_centronics_busy)) - MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(tandy200_state, write_centronics_select)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, tandy200_state, write_centronics_busy)) + MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, tandy200_state, write_centronics_select)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) |