summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/firebeat.c
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2014-05-07 16:40:09 +0000
committer Ivan Vangelista <mesgnet@yahoo.it>2014-05-07 16:40:09 +0000
commit8ebb7d29336f182a26640206f51a4e1bf3d9737e (patch)
treecef88ccc2f372bdfda8c54c8abf5e9e7bf917307 /src/mame/drivers/firebeat.c
parent2e2436da429da788836909656cb0df1d2b03ebc2 (diff)
ins8250_device: converted to devcb2 (nw)
Diffstat (limited to 'src/mame/drivers/firebeat.c')
-rw-r--r--src/mame/drivers/firebeat.c58
1 files changed, 16 insertions, 42 deletions
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index c934b11ab4e..f9ff9366cb7 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -1095,25 +1095,6 @@ static void comm_uart_irq_callback(running_machine &machine, int channel, int va
//m_maincpu->set_input_line(INPUT_LINE_IRQ2, ASSERT_LINE);
}
*/
-static const ins8250_interface firebeat_com0_interface =
-{
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL
-};
-
-static const ins8250_interface firebeat_com1_interface =
-{
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL
-};
/*****************************************************************************/
@@ -1190,25 +1171,6 @@ WRITE_LINE_MEMBER(firebeat_state::midi_uart_ch1_irq_callback)
m_maincpu->set_input_line(INPUT_LINE_IRQ1, CLEAR_LINE);
}
-static const ins8250_interface firebeat_midi0_interface =
-{
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_DRIVER_LINE_MEMBER(firebeat_state, midi_uart_ch0_irq_callback),
- DEVCB_NULL,
- DEVCB_NULL
-};
-
-static const ins8250_interface firebeat_midi1_interface =
-{
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_NULL,
- DEVCB_DRIVER_LINE_MEMBER(firebeat_state, midi_uart_ch1_irq_callback),
- DEVCB_NULL,
- DEVCB_NULL
-};
/*
static const int keyboard_notes[24] =
{
@@ -1778,8 +1740,14 @@ static MACHINE_CONFIG_START( firebeat, firebeat_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_PC16552D_ADD("duart_com", firebeat_com0_interface, firebeat_com1_interface, XTAL_19_6608MHz) // pgmd to 9600baud
- MCFG_PC16552D_ADD("duart_midi", firebeat_midi0_interface, firebeat_midi1_interface, XTAL_24MHz) // in all memory maps, pgmd to 31250baud
+ MCFG_DEVICE_ADD("duart_com", PC16552D, 0) // pgmd to 9600baud
+ MCFG_DEVICE_ADD("duart_com:chan0", NS16550, XTAL_19_6608MHz)
+ MCFG_DEVICE_ADD("duart_com:chan1", NS16550, XTAL_19_6608MHz)
+ MCFG_DEVICE_ADD("duart_midi", PC16552D, 0) // in all memory maps, pgmd to 31250baud
+ MCFG_DEVICE_ADD("duart_midi:chan0", NS16550, XTAL_24MHz)
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(firebeat_state, midi_uart_ch0_irq_callback))
+ MCFG_DEVICE_ADD("duart_midi:chan1", NS16550, XTAL_24MHz)
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(firebeat_state, midi_uart_ch1_irq_callback))
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( firebeat2, firebeat_state )
@@ -1834,8 +1802,14 @@ static MACHINE_CONFIG_START( firebeat2, firebeat_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_PC16552D_ADD("duart_com", firebeat_com0_interface, firebeat_com1_interface, XTAL_19_6608MHz)
- MCFG_PC16552D_ADD("duart_midi", firebeat_midi0_interface, firebeat_midi1_interface, XTAL_24MHz)
+ MCFG_DEVICE_ADD("duart_com", PC16552D, 0)
+ MCFG_DEVICE_ADD("duart_com:chan0", NS16550, XTAL_19_6608MHz)
+ MCFG_DEVICE_ADD("duart_com:chan1", NS16550, XTAL_19_6608MHz)
+ MCFG_DEVICE_ADD("duart_midi", PC16552D, 0)
+ MCFG_DEVICE_ADD("duart_midi:chan0", NS16550, XTAL_24MHz)
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(firebeat_state, midi_uart_ch0_irq_callback))
+ MCFG_DEVICE_ADD("duart_midi:chan1", NS16550, XTAL_24MHz)
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(firebeat_state, midi_uart_ch1_irq_callback))
MCFG_MIDI_KBD_ADD("kbd0", DEVWRITELINE("duart_midi:chan0", ins8250_uart_device, rx_w), 31250)
MCFG_MIDI_KBD_ADD("kbd1", DEVWRITELINE("duart_midi:chan1", ins8250_uart_device, rx_w), 31250)
MACHINE_CONFIG_END