summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/firebeat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/firebeat.cpp')
-rw-r--r--src/mame/drivers/firebeat.cpp37
1 files changed, 19 insertions, 18 deletions
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp
index 40cdc1c55ff..407433be345 100644
--- a/src/mame/drivers/firebeat.cpp
+++ b/src/mame/drivers/firebeat.cpp
@@ -1223,14 +1223,14 @@ MACHINE_CONFIG_START(firebeat_state::firebeat)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_DEVICE_ADD("duart_com", PC16552D, 0) // pgmd to 9600baud
- MCFG_DEVICE_ADD("duart_com:chan0", NS16550, XTAL(19'660'800))
- MCFG_DEVICE_ADD("duart_com:chan1", NS16550, XTAL(19'660'800))
- MCFG_DEVICE_ADD("duart_midi", PC16552D, 0) // in all memory maps, pgmd to 31250baud
- MCFG_DEVICE_ADD("duart_midi:chan0", NS16550, XTAL(24'000'000))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, firebeat_state, midi_uart_ch0_irq_callback))
- MCFG_DEVICE_ADD("duart_midi:chan1", NS16550, XTAL(24'000'000))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, firebeat_state, midi_uart_ch1_irq_callback))
+ PC16552D(config, "duart_com", 0); // pgmd to 9600baud
+ NS16550(config, "duart_com:chan0", XTAL(19'660'800));
+ NS16550(config, "duart_com:chan1", XTAL(19'660'800));
+ PC16552D(config, "duart_midi", 0); // in all memory maps, pgmd to 31250baud
+ ns16550_device &midi_chan0(NS16550(config, "duart_midi:chan0", XTAL(24'000'000)));
+ midi_chan0.out_int_callback().set(FUNC(firebeat_state::midi_uart_ch0_irq_callback));
+ ns16550_device &midi_chan1(NS16550(config, "duart_midi:chan1", XTAL(24'000'000)));
+ midi_chan1.out_int_callback().set(FUNC(firebeat_state::midi_uart_ch1_irq_callback));
MACHINE_CONFIG_END
MACHINE_CONFIG_START(firebeat_state::firebeat2)
@@ -1292,16 +1292,17 @@ MACHINE_CONFIG_START(firebeat_state::firebeat2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_DEVICE_ADD("duart_com", PC16552D, 0)
- MCFG_DEVICE_ADD("duart_com:chan0", NS16550, XTAL(19'660'800))
- MCFG_DEVICE_ADD("duart_com:chan1", NS16550, XTAL(19'660'800))
- MCFG_DEVICE_ADD("duart_midi", PC16552D, 0)
- MCFG_DEVICE_ADD("duart_midi:chan0", NS16550, XTAL(24'000'000))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, firebeat_state, midi_uart_ch0_irq_callback))
- MCFG_DEVICE_ADD("duart_midi:chan1", NS16550, XTAL(24'000'000))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, firebeat_state, midi_uart_ch1_irq_callback))
- MCFG_MIDI_KBD_ADD("kbd0", WRITELINE("duart_midi:chan0", ins8250_uart_device, rx_w), 31250)
- MCFG_MIDI_KBD_ADD("kbd1", WRITELINE("duart_midi:chan1", ins8250_uart_device, rx_w), 31250)
+ PC16552D(config, "duart_com", 0);
+ NS16550(config, "duart_com:chan0", XTAL(19'660'800));
+ NS16550(config, "duart_com:chan1", XTAL(19'660'800));
+ PC16552D(config, "duart_midi", 0);
+ ns16550_device &midi_chan0(NS16550(config, "duart_midi:chan0", XTAL(24'000'000)));
+ midi_chan0.out_int_callback().set(FUNC(firebeat_state::midi_uart_ch0_irq_callback));
+ ns16550_device &midi_chan1(NS16550(config, "duart_midi:chan1", XTAL(24'000'000)));
+ midi_chan1.out_int_callback().set(FUNC(firebeat_state::midi_uart_ch1_irq_callback));
+
+ MCFG_MIDI_KBD_ADD("kbd0", WRITELINE(midi_chan0, ins8250_uart_device, rx_w), 31250)
+ MCFG_MIDI_KBD_ADD("kbd1", WRITELINE(midi_chan1, ins8250_uart_device, rx_w), 31250)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(firebeat_state::firebeat_spu)