summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/devices/cpu/m68000/m68000.h8
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp35
-rw-r--r--src/mame/drivers/applix.cpp2
-rw-r--r--src/mame/drivers/bitgraph.cpp8
-rw-r--r--src/mame/drivers/bmcbowl.cpp2
-rw-r--r--src/mame/drivers/esh.cpp12
-rw-r--r--src/mame/drivers/sage2.cpp2
7 files changed, 16 insertions, 53 deletions
diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h
index 302af32af71..3254f656f4e 100644
--- a/src/devices/cpu/m68000/m68000.h
+++ b/src/devices/cpu/m68000/m68000.h
@@ -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();
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp
index 7a76094bdc5..18de1a02e04 100644
--- a/src/devices/cpu/m68000/m68kcpu.cpp
+++ b/src/devices/cpu/m68000/m68kcpu.cpp
@@ -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 */
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index f2cd3a9650a..8b343a19f13 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -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))
diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp
index 7a8e3231683..a3806bf7718 100644
--- a/src/mame/drivers/bitgraph.cpp
+++ b/src/mame/drivers/bitgraph.cpp
@@ -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))
diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp
index 22ec178a84d..91f1cb102b7 100644
--- a/src/mame/drivers/bmcbowl.cpp
+++ b/src/mame/drivers/bmcbowl.cpp
@@ -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 )
diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp
index f31fda60211..b3bcfd51cd9 100644
--- a/src/mame/drivers/esh.cpp
+++ b/src/mame/drivers/esh.cpp
@@ -29,6 +29,7 @@ Todo:
#include "cpu/z80/z80.h"
#include "machine/ldv1000.h"
#include "machine/nvram.h"
+#include "sound/beep.h"
class esh_state : public driver_device
@@ -42,6 +43,7 @@ public:
m_tile_control_ram(*this, "tile_ctrl_ram"),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
+ m_beep(*this, "beeper"),
m_palette(*this, "palette") { }
required_device<pioneer_ldv1000_device> m_laserdisc;
@@ -63,6 +65,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(ld_command_strobe_cb);
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
+ required_device<beep_device> m_beep;
required_device<palette_device> m_palette;
protected:
@@ -147,9 +150,9 @@ WRITE8_MEMBER(esh_state::misc_write)
{
/* Bit 0 unknown */
- if (data & 0x02)
- logerror("BEEP!\n");
-
+// if (data & 0x02)
+// logerror("BEEP!\n");
+ m_beep->set_state(BIT(data, 1)); // polarity unknown
/* Bit 2 unknown */
m_ld_video_visible = bool(!((data & 0x08) >> 3));
@@ -374,6 +377,9 @@ static MACHINE_CONFIG_START( esh, esh_state )
MCFG_SOUND_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("beeper", BEEP, 2000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
// we just disable even lines so we can simulate line blinking
diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp
index 500c7c0239b..68e714fa708 100644
--- a/src/mame/drivers/sage2.cpp
+++ b/src/mame/drivers/sage2.cpp
@@ -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")