summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Nigel Barnes <Pernod70@users.noreply.github.com>2017-10-11 02:40:01 +0100
committer Nigel Barnes <Pernod70@users.noreply.github.com>2017-10-11 12:03:01 +0100
commitf6ddda9fbd586791ec6bb34b0a8c89c15773c2f3 (patch)
treee4ccd16e93ef9f200064fb736c4569f2359f3b36
parent1e1fb0902acff3a9641a0feff0860e5ab9e7bf79 (diff)
tube_z80: Removed trampolines (nw)
-rw-r--r--src/devices/bus/bbc/tube/tube_z80.cpp14
-rw-r--r--src/devices/bus/bbc/tube/tube_z80.h2
2 files changed, 1 insertions, 15 deletions
diff --git a/src/devices/bus/bbc/tube/tube_z80.cpp b/src/devices/bus/bbc/tube/tube_z80.cpp
index a77f1ac0ab8..f1a346b3617 100644
--- a/src/devices/bus/bbc/tube/tube_z80.cpp
+++ b/src/devices/bus/bbc/tube/tube_z80.cpp
@@ -42,7 +42,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
static ADDRESS_MAP_START(tube_z80_io, AS_IO, 8, bbc_tube_z80_device)
- AM_RANGE(0x00, 0x07) AM_MIRROR(0xff00) AM_READWRITE(io_r, io_w)
+ AM_RANGE(0x00, 0x07) AM_MIRROR(0xff00) AM_DEVREADWRITE("ula", tube_device, parasite_r, parasite_w)
ADDRESS_MAP_END
//-------------------------------------------------
@@ -173,18 +173,6 @@ WRITE8_MEMBER(bbc_tube_z80_device::mem_w)
m_ram->pointer()[offset] = data;
}
-
-READ8_MEMBER(bbc_tube_z80_device::io_r)
-{
- return m_ula->parasite_r(space, offset);
-}
-
-WRITE8_MEMBER(bbc_tube_z80_device::io_w)
-{
- m_ula->parasite_w(space, offset, data);
-}
-
-
WRITE_LINE_MEMBER(bbc_tube_z80_device::nmi_w)
{
m_z80->set_input_line(INPUT_LINE_NMI, state);
diff --git a/src/devices/bus/bbc/tube/tube_z80.h b/src/devices/bus/bbc/tube/tube_z80.h
index 0e4d51a2eb4..8ef5e59ee64 100644
--- a/src/devices/bus/bbc/tube/tube_z80.h
+++ b/src/devices/bus/bbc/tube/tube_z80.h
@@ -34,8 +34,6 @@ public:
DECLARE_READ8_MEMBER( mem_r );
DECLARE_WRITE8_MEMBER( mem_w );
DECLARE_READ8_MEMBER( opcode_r );
- DECLARE_READ8_MEMBER( io_r );
- DECLARE_WRITE8_MEMBER( io_w );
protected:
// device-level overrides