Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-25 09:50:04 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1061 from ajrhacker/m68k_write_irq

Browse Source 
Replace M68000 write_irq[1-7] handlers with DEVCB_INPUTLINE (nw)
This commit is contained in:
R. Belmont 2016-07-07 22:35:27 -04:00 committed by GitHub
commit 7eb9149858
6 changed files with 7 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/cpu/m68000/m68000.h
View File

@ -133,14 +133,6 @@ public:
m68000_base_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_WRITE_LINE_MEMBER( write_irq1 );
DECLARE_WRITE_LINE_MEMBER( write_irq2 );
DECLARE_WRITE_LINE_MEMBER( write_irq3 );
DECLARE_WRITE_LINE_MEMBER( write_irq4 );
DECLARE_WRITE_LINE_MEMBER( write_irq5 );
DECLARE_WRITE_LINE_MEMBER( write_irq6 );
DECLARE_WRITE_LINE_MEMBER( write_irq7 );
void presave();
void postload();

35
src/devices/cpu/m68000/m68kcpu.cpp
View File

@ -704,41 +704,6 @@ static void m68k_cause_bus_error(m68000_base_device *m68k)
m68ki_jump_vector(m68k, EXCEPTION_BUS_ERROR);
}
WRITE_LINE_MEMBER( m68000_base_device::write_irq1 )
{
set_input_line( M68K_IRQ_1, state );
}
WRITE_LINE_MEMBER( m68000_base_device::write_irq2 )
{
set_input_line( M68K_IRQ_2, state );
}
WRITE_LINE_MEMBER( m68000_base_device::write_irq3 )
{
set_input_line( M68K_IRQ_3, state );
}
WRITE_LINE_MEMBER( m68000_base_device::write_irq4 )
{
set_input_line( M68K_IRQ_4, state );
}
WRITE_LINE_MEMBER( m68000_base_device::write_irq5 )
{
set_input_line( M68K_IRQ_5, state );
}
WRITE_LINE_MEMBER( m68000_base_device::write_irq6 )
{
set_input_line( M68K_IRQ_6, state );
}
WRITE_LINE_MEMBER( m68000_base_device::write_irq7 )
{
set_input_line( M68K_IRQ_7, state );
}
bool m68000_base_device::memory_translate(address_spacenum space, int intention, offs_t &address)
{
/* only applies to the program address space and only does something if the MMU's enabled */

2
src/mame/drivers/applix.cpp
View File

@ -870,7 +870,7 @@ static MACHINE_CONFIG_START( applix, applix_state )
// in CB2 kdb data
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(applix_state, applix_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(applix_state, applix_pb_w))
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m68000_device, write_irq2))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522", via6522_device, write_ca1))

8
src/mame/drivers/bitgraph.cpp
View File

@ -471,7 +471,7 @@ static MACHINE_CONFIG_FRAGMENT( bg_motherboard )
MCFG_DEVICE_ADD(ACIA0_TAG, ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_H_TAG, rs232_port_device, write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_H_TAG, rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE(M68K_TAG, m68000_device, write_irq1))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE(M68K_TAG, M68K_IRQ_1))
MCFG_RS232_PORT_ADD(RS232_H_TAG, default_rs232_devices, "null_modem")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA0_TAG, acia6850_device, write_rxd))
@ -481,7 +481,7 @@ static MACHINE_CONFIG_FRAGMENT( bg_motherboard )
MCFG_DEVICE_ADD(ACIA1_TAG, ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_K_TAG, rs232_port_device, write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_K_TAG, rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE(M68K_TAG, m68000_device, write_irq1))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE(M68K_TAG, M68K_IRQ_1))
MCFG_RS232_PORT_ADD(RS232_K_TAG, default_rs232_devices, "keyboard")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA1_TAG, acia6850_device, write_rxd))
@ -491,7 +491,7 @@ static MACHINE_CONFIG_FRAGMENT( bg_motherboard )
MCFG_DEVICE_ADD(ACIA2_TAG, ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE(M68K_TAG, m68000_device, write_irq1))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE(M68K_TAG, M68K_IRQ_1))
MCFG_RS232_PORT_ADD(RS232_D_TAG, default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA2_TAG, acia6850_device, write_rxd))
@ -554,7 +554,7 @@ static MACHINE_CONFIG_START( bitgrpha, bitgraph_state )
MCFG_DEVICE_ADD(ACIA3_TAG, ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_M_TAG, rs232_port_device, write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_M_TAG, rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE(M68K_TAG, m68000_device, write_irq1))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE(M68K_TAG, M68K_IRQ_1))
MCFG_RS232_PORT_ADD(RS232_M_TAG, default_rs232_devices, nullptr)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA3_TAG, acia6850_device, write_rxd))

2
src/mame/drivers/bmcbowl.cpp
View File

@ -488,7 +488,7 @@ static MACHINE_CONFIG_START( bmcbowl, bmcbowl_state )
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(bmcbowl_state, via_a_out))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(bmcbowl_state, via_b_out))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(bmcbowl_state, via_ca2_out))
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m68000_device, write_irq4))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_4))
MACHINE_CONFIG_END
ROM_START( bmcbowl )

2
src/mame/drivers/sage2.cpp
View File

@ -474,7 +474,7 @@ static MACHINE_CONFIG_START( sage2, sage2_state )
MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE(M68000_TAG, m68000_base_device, write_irq5))
MCFG_I8251_RXRDY_HANDLER(INPUTLINE(M68000_TAG, M68K_IRQ_5))
MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE(I8259_TAG, pic8259_device, ir2_w))
MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal")