diff options
Diffstat (limited to 'src/mame/drivers/apple3.cpp')
-rw-r--r-- | src/mame/drivers/apple3.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp index 77c2cd75887..0ad1bb978a2 100644 --- a/src/mame/drivers/apple3.cpp +++ b/src/mame/drivers/apple3.cpp @@ -55,9 +55,9 @@ FLOPPY_FORMATS_END MACHINE_CONFIG_START(apple3_state::apple3) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz */ - MCFG_M6502_SYNC_CALLBACK(WRITELINE(apple3_state, apple3_sync_w)) - MCFG_CPU_PROGRAM_MAP(apple3_map) + MCFG_DEVICE_ADD("maincpu", M6502, 2000000) /* 2 MHz */ + MCFG_M6502_SYNC_CALLBACK(WRITELINE(*this, apple3_state, apple3_sync_w)) + MCFG_DEVICE_PROGRAM_MAP(apple3_map) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_MACHINE_RESET_OVERRIDE(apple3_state, apple3 ) @@ -89,16 +89,16 @@ MACHINE_CONFIG_START(apple3_state::apple3) MCFG_AY3600_MATRIX_X6(IOPORT("X6")) MCFG_AY3600_MATRIX_X7(IOPORT("X7")) MCFG_AY3600_MATRIX_X8(IOPORT("X8")) - MCFG_AY3600_SHIFT_CB(READLINE(apple3_state, ay3600_shift_r)) - MCFG_AY3600_CONTROL_CB(READLINE(apple3_state, ay3600_control_r)) - MCFG_AY3600_DATA_READY_CB(WRITELINE(apple3_state, ay3600_data_ready_w)) + MCFG_AY3600_SHIFT_CB(READLINE(*this, apple3_state, ay3600_shift_r)) + MCFG_AY3600_CONTROL_CB(READLINE(*this, apple3_state, ay3600_control_r)) + MCFG_AY3600_DATA_READY_CB(WRITELINE(*this, apple3_state, ay3600_data_ready_w)) /* slot bus */ MCFG_DEVICE_ADD("a2bus", A2BUS, 0) MCFG_A2BUS_CPU("maincpu") - MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(apple3_state, a2bus_irq_w)) - MCFG_A2BUS_OUT_NMI_CB(WRITELINE(apple3_state, a2bus_nmi_w)) - //MCFG_A2BUS_OUT_INH_CB(WRITELINE(apple3_state, a2bus_inh_w)) + MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(*this, apple3_state, a2bus_irq_w)) + MCFG_A2BUS_OUT_NMI_CB(WRITELINE(*this, apple3_state, a2bus_nmi_w)) + //MCFG_A2BUS_OUT_INH_CB(WRITELINE(*this, apple3_state, a2bus_inh_w)) MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple3_cards, nullptr) MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple3_cards, nullptr) MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple3_cards, nullptr) @@ -117,15 +117,15 @@ MACHINE_CONFIG_START(apple3_state::apple3) /* acia */ MCFG_DEVICE_ADD("acia", MOS6551, 0) MCFG_MOS6551_XTAL(XTAL(1'843'200)) // HACK: The schematic shows an external clock generator but using a XTAL is faster to emulate. - MCFG_MOS6551_IRQ_HANDLER(WRITELINE(apple3_state, apple3_acia_irq_func)) - MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) - MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) - MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) - - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_rxd)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dcd)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dsr)) + MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, apple3_state, apple3_acia_irq_func)) + MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd)) + MCFG_MOS6551_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts)) + MCFG_MOS6551_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr)) + + MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE("acia", mos6551_device, write_rxd)) + MCFG_RS232_DCD_HANDLER(WRITELINE("acia", mos6551_device, write_dcd)) + MCFG_RS232_DSR_HANDLER(WRITELINE("acia", mos6551_device, write_dsr)) // TODO: remove cts kludge from machine/apple3.c and come up with a good way of coping with pull up resistors. /* paddle */ @@ -136,19 +136,19 @@ MACHINE_CONFIG_START(apple3_state::apple3) /* via */ MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(apple3_state, apple3_via_0_out_a)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(apple3_state, apple3_via_0_out_b)) - MCFG_VIA6522_IRQ_HANDLER(WRITELINE(apple3_state, apple3_via_0_irq_func)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, apple3_state, apple3_via_0_out_a)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, apple3_state, apple3_via_0_out_b)) + MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, apple3_state, apple3_via_0_irq_func)) MCFG_DEVICE_ADD("via6522_1", VIA6522, 1000000) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(apple3_state, apple3_via_1_out_a)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(apple3_state, apple3_via_1_out_b)) - MCFG_VIA6522_IRQ_HANDLER(WRITELINE(apple3_state, apple3_via_1_irq_func)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, apple3_state, apple3_via_1_out_a)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, apple3_state, apple3_via_1_out_b)) + MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, apple3_state, apple3_via_1_irq_func)) /* sound */ MCFG_SPEAKER_STANDARD_MONO("speaker") - MCFG_SOUND_ADD("bell", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99) - MCFG_SOUND_ADD("dac", DAC_6BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) // 6522.b5(pb0-pb5) + 320k,160k,80k,40k,20k,10k + MCFG_DEVICE_ADD("bell", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99) + MCFG_DEVICE_ADD("dac", DAC_6BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) // 6522.b5(pb0-pb5) + 320k,160k,80k,40k,20k,10k MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "bell", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) |