diff options
Diffstat (limited to 'src/mame/drivers/aristmk5.cpp')
-rw-r--r-- | src/mame/drivers/aristmk5.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp index aa6a9e8952f..55012a00697 100644 --- a/src/mame/drivers/aristmk5.cpp +++ b/src/mame/drivers/aristmk5.cpp @@ -2037,8 +2037,8 @@ void aristmk5_state::machine_reset() MACHINE_CONFIG_START(aristmk5_state::aristmk5) - MCFG_CPU_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000 - MCFG_CPU_PROGRAM_MAP(aristmk5_drame_map) + MCFG_DEVICE_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000 + MCFG_DEVICE_PROGRAM_MAP(aristmk5_drame_map) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(2)) /* 1.6 - 2 seconds */ @@ -2062,44 +2062,44 @@ MACHINE_CONFIG_START(aristmk5_state::aristmk5) // TL16C452FN U71 MCFG_DEVICE_ADD("uart_0a", NS16450, MASTER_CLOCK / 9) - MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("uart_irq", input_merger_device, in_w<0>)) + MCFG_INS8250_OUT_INT_CB(WRITELINE("uart_irq", input_merger_device, in_w<0>)) MCFG_DEVICE_ADD("uart_0b", NS16450, MASTER_CLOCK / 9) - MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("uart_irq", input_merger_device, in_w<1>)) + MCFG_INS8250_OUT_INT_CB(WRITELINE("uart_irq", input_merger_device, in_w<1>)) // TL16C452FN U72 MCFG_DEVICE_ADD("uart_1a", NS16450, MASTER_CLOCK / 9) - MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("uart_irq", input_merger_device, in_w<2>)) + MCFG_INS8250_OUT_INT_CB(WRITELINE("uart_irq", input_merger_device, in_w<2>)) MCFG_DEVICE_ADD("uart_1b", NS16450, MASTER_CLOCK / 9) - MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("uart_irq", input_merger_device, in_w<3>)) + MCFG_INS8250_OUT_INT_CB(WRITELINE("uart_irq", input_merger_device, in_w<3>)) // COMM port 4 - 5 MCFG_DEVICE_ADD("uart_2a", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, aristmk5_state, uart_irq_callback)) MCFG_DEVICE_ADD("uart_2b", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, aristmk5_state, uart_irq_callback)) // COMM port 6 - 7 MCFG_DEVICE_ADD("uart_3a", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, aristmk5_state, uart_irq_callback)) MCFG_DEVICE_ADD("uart_3b", NS16450, MASTER_CLOCK / 9) -// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback)) +// MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, aristmk5_state, uart_irq_callback)) MCFG_INPUT_MERGER_ANY_HIGH("uart_irq") - MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(aristmk5_state, uart_irq_callback)) + MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, aristmk5_state, uart_irq_callback)) MCFG_DS1302_ADD("rtc", XTAL(32'768)) MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW) MCFG_SPEAKER_STANDARD_MONO("speaker") - MCFG_SOUND_ADD("dac0", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC - MCFG_SOUND_ADD("dac1", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC - MCFG_SOUND_ADD("dac2", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC - MCFG_SOUND_ADD("dac3", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC - MCFG_SOUND_ADD("dac4", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC - MCFG_SOUND_ADD("dac5", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC - MCFG_SOUND_ADD("dac6", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC - MCFG_SOUND_ADD("dac7", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac0", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac1", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac2", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac3", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac4", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac5", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac6", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac7", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) @@ -2115,23 +2115,23 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(aristmk5_state::aristmk5_touch) aristmk5(config); MCFG_DEVICE_MODIFY("uart_0a") - MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx)) + MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx)) - MCFG_MICROTOUCH_ADD("microtouch", 2400, DEVWRITELINE("uart_0a", ins8250_uart_device, rx_w)) + MCFG_MICROTOUCH_ADD("microtouch", 2400, WRITELINE("uart_0a", ins8250_uart_device, rx_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(aristmk5_state::aristmk5_usa) aristmk5(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(aristmk5_usa_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(aristmk5_usa_map) MACHINE_CONFIG_END MACHINE_CONFIG_START(aristmk5_state::aristmk5_usa_touch) aristmk5_usa(config); MCFG_DEVICE_MODIFY("uart_0a") - MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx)) + MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx)) - MCFG_MICROTOUCH_ADD("microtouch", 2400, DEVWRITELINE("uart_0a", ins8250_uart_device, rx_w)) + MCFG_MICROTOUCH_ADD("microtouch", 2400, WRITELINE("uart_0a", ins8250_uart_device, rx_w)) MACHINE_CONFIG_END #define ARISTOCRAT_MK5_BIOS \ |