summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2018-02-10 16:28:34 -0500
committerGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2018-02-10 16:28:34 -0500
commit7597f0cef860710bb311cbba91bd712a22c2f5de (patch) (github)
tree0b9c098cf5fc8bf96ea8339b3e4c1f18e07adc86
parentb25be7d1e48bbd14ed8a54713d179ae3f5857da0 (diff)
downloadmame-7597f0cef860710bb311cbba91bd712a22c2f5de.tar.bz2
mame-7597f0cef860710bb311cbba91bd712a22c2f5de.zip
trs80m16: Replace 8259 device with Am9519 (nw)
-rw-r--r--src/mame/drivers/trs80m2.cpp14
-rw-r--r--src/mame/includes/trs80m2.h6
2 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp
index 3645d0b8dc1..4807732d9d9 100644
--- a/src/mame/drivers/trs80m2.cpp
+++ b/src/mame/drivers/trs80m2.cpp
@@ -282,9 +282,9 @@ WRITE8_MEMBER( trs80m16_state::tcl_w )
m_subcpu->set_input_line(INPUT_LINE_HALT, BIT(data, 2) ? ASSERT_LINE : CLEAR_LINE);
m_subcpu->set_input_line(INPUT_LINE_RESET, BIT(data, 3) ? ASSERT_LINE : CLEAR_LINE);
- m_pic->ir0_w(BIT(data, 4));
- m_pic->ir1_w(BIT(data, 5));
- m_pic->ir2_w(BIT(data, 6));
+ m_uic->ireq0_w(BIT(data, 4));
+ m_uic->ireq1_w(BIT(data, 5));
+ m_uic->ireq2_w(BIT(data, 6));
m_ual = (m_ual & 0x1fe) | BIT(data, 7);
}
@@ -360,7 +360,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
static ADDRESS_MAP_START( m68000_mem, AS_PROGRAM, 16, trs80m2_state )
-// AM_RANGE(0x7800d0, 0x7800d1) PIC
+// AM_RANGE(0x7800d0, 0x7800d1) 9519A (C/D = UDS)
// AM_RANGE(0x7800d2, 0x7800d3) limit/offset 2
// AM_RANGE(0x7800d4, 0x7800d5) limit/offset 1
// AM_RANGE(0x7800d6, 0x7800d7) Z80 IRQ
@@ -793,7 +793,7 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain)
MCFG_CPU_PROGRAM_MAP(z80_mem)
MCFG_CPU_IO_MAP(m16_z80_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(AM9519A_TAG, pic8259_device, inta_cb)
+ MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(AM9519A_TAG, am9519_device, iack_cb)
MCFG_CPU_ADD(M68000_TAG, M68000, XTAL(24'000'000)/4)
MCFG_CPU_PROGRAM_MAP(m68000_mem)
@@ -851,8 +851,8 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(8'000'000)/2)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD(AM9519A_TAG, PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(INPUTLINE(M68000_TAG, M68K_IRQ_5))
+ MCFG_DEVICE_ADD(AM9519A_TAG, AM9519, 0)
+ MCFG_AM9519_OUT_INT_CB(INPUTLINE(M68000_TAG, M68K_IRQ_5))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(Z80PIO_TAG, z80pio_device, strobe_b))
diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h
index 0f8b818d021..887aebbf411 100644
--- a/src/mame/includes/trs80m2.h
+++ b/src/mame/includes/trs80m2.h
@@ -11,8 +11,8 @@
#include "cpu/mcs48/mcs48.h"
#include "cpu/m68000/m68000.h"
#include "bus/centronics/ctronics.h"
+#include "machine/am9519.h"
#include "machine/keyboard.h"
-#include "machine/pic8259.h"
#include "machine/ram.h"
#include "machine/timer.h"
#include "machine/trs80m2kb.h"
@@ -150,7 +150,7 @@ public:
trs80m16_state(const machine_config &mconfig, device_type type, const char *tag)
: trs80m2_state(mconfig, type, tag)
, m_subcpu(*this, M68000_TAG)
- , m_pic(*this, AM9519A_TAG)
+ , m_uic(*this, AM9519A_TAG)
{
}
@@ -162,7 +162,7 @@ protected:
virtual void machine_start() override;
required_device<cpu_device> m_subcpu;
- required_device<pic8259_device> m_pic;
+ required_device<am9519_device> m_uic;
uint16_t m_ual;
uint8_t m_limit[2];