summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Michaël Banaan Ananas <happppp@users.noreply.github.com>2014-07-31 20:40:24 +0000
committer Michaël Banaan Ananas <happppp@users.noreply.github.com>2014-07-31 20:40:24 +0000
commite72490c39d37e0149aeb2e84789f004736e29108 (patch)
tree6ad13eb48a61984e9a3a0a37bc17c99fc1c478e1
parent5e8603d43d53c659b4bdfc0af554f89258c64af8 (diff)
small cleanup
-rw-r--r--src/emu/cpu/z80/tmpz84c011.c105
-rw-r--r--src/emu/cpu/z80/tmpz84c011.h42
2 files changed, 21 insertions, 126 deletions
diff --git a/src/emu/cpu/z80/tmpz84c011.c b/src/emu/cpu/z80/tmpz84c011.c
index 1d8a636e851..61bf67762e5 100644
--- a/src/emu/cpu/z80/tmpz84c011.c
+++ b/src/emu/cpu/z80/tmpz84c011.c
@@ -108,111 +108,6 @@ void tmpz84c011_device::device_reset()
/* CPU interface */
-READ8_MEMBER(tmpz84c011_device::tmpz84c011_pa_r)
-{
- return (m_inportsa() & ~m_pio_dir[0]) | (m_pio_latch[0] & m_pio_dir[0]);
-}
-
-READ8_MEMBER(tmpz84c011_device::tmpz84c011_pb_r)
-{
- return (m_inportsb() & ~m_pio_dir[1]) | (m_pio_latch[1] & m_pio_dir[1]);
-}
-
-READ8_MEMBER(tmpz84c011_device::tmpz84c011_pc_r)
-{
- return (m_inportsc() & ~m_pio_dir[2]) | (m_pio_latch[2] & m_pio_dir[2]);
-}
-
-READ8_MEMBER(tmpz84c011_device::tmpz84c011_pd_r)
-{
- return (m_inportsd() & ~m_pio_dir[3]) | (m_pio_latch[3] & m_pio_dir[3]);
-}
-
-READ8_MEMBER(tmpz84c011_device::tmpz84c011_pe_r)
-{
- return (m_inportse() & ~m_pio_dir[4]) | (m_pio_latch[4] & m_pio_dir[4]);
-}
-
-WRITE8_MEMBER(tmpz84c011_device::tmpz84c011_pa_w)
-{
- m_pio_latch[0] = data;
- m_outportsa(data & m_pio_dir[0]);
-}
-
-WRITE8_MEMBER(tmpz84c011_device::tmpz84c011_pb_w)
-{
- m_pio_latch[1] = data;
- m_outportsb(data & m_pio_dir[1]);
-}
-WRITE8_MEMBER(tmpz84c011_device::tmpz84c011_pc_w)
-{
- m_pio_latch[2] = data;
- m_outportsc(data & m_pio_dir[2]);
-}
-
-WRITE8_MEMBER(tmpz84c011_device::tmpz84c011_pd_w)
-{
- m_pio_latch[3] = data;
- m_outportsd(data & m_pio_dir[3]);
-}
-
-WRITE8_MEMBER(tmpz84c011_device::tmpz84c011_pe_w)
-{
- m_pio_latch[4] = data;
- m_outportse(data & m_pio_dir[4]);
-}
-
-READ8_MEMBER(tmpz84c011_device::tmpz84c011_dir_pa_r)
-{
- return m_pio_dir[0];
-}
-
-READ8_MEMBER(tmpz84c011_device::tmpz84c011_dir_pb_r)
-{
- return m_pio_dir[1];
-}
-
-READ8_MEMBER(tmpz84c011_device::tmpz84c011_dir_pc_r)
-{
- return m_pio_dir[2];
-}
-
-READ8_MEMBER(tmpz84c011_device::tmpz84c011_dir_pd_r)
-{
- return m_pio_dir[3];
-}
-
-READ8_MEMBER(tmpz84c011_device::tmpz84c011_dir_pe_r)
-{
- return m_pio_dir[4];
-}
-
-WRITE8_MEMBER(tmpz84c011_device::tmpz84c011_dir_pa_w)
-{
- m_pio_dir[0] = data;
-}
-
-WRITE8_MEMBER(tmpz84c011_device::tmpz84c011_dir_pb_w)
-{
- m_pio_dir[1] = data;
-}
-
-WRITE8_MEMBER(tmpz84c011_device::tmpz84c011_dir_pc_w)
-{
- m_pio_dir[2] = data;
-}
-
-WRITE8_MEMBER(tmpz84c011_device::tmpz84c011_dir_pd_w)
-{
- m_pio_dir[3] = data;
-}
-
-WRITE8_MEMBER(tmpz84c011_device::tmpz84c011_dir_pe_w)
-{
- m_pio_dir[4] = data;
-}
-
-
static MACHINE_CONFIG_FRAGMENT( tmpz84c011 )
MCFG_DEVICE_ADD("tmpz84c011_ctc", Z80CTC, DERIVED_CLOCK(1,1) )
MCFG_Z80CTC_INTR_CB(INPUTLINE(DEVICE_SELF, INPUT_LINE_IRQ0))
diff --git a/src/emu/cpu/z80/tmpz84c011.h b/src/emu/cpu/z80/tmpz84c011.h
index 553a24d8fda..57224e54914 100644
--- a/src/emu/cpu/z80/tmpz84c011.h
+++ b/src/emu/cpu/z80/tmpz84c011.h
@@ -100,27 +100,27 @@ public:
/////////////////////////////////////////////////////////
- DECLARE_READ8_MEMBER( tmpz84c011_pa_r );
- DECLARE_READ8_MEMBER( tmpz84c011_pb_r );
- DECLARE_READ8_MEMBER( tmpz84c011_pc_r );
- DECLARE_READ8_MEMBER( tmpz84c011_pd_r );
- DECLARE_READ8_MEMBER( tmpz84c011_pe_r );
- DECLARE_WRITE8_MEMBER( tmpz84c011_pa_w );
- DECLARE_WRITE8_MEMBER( tmpz84c011_pb_w );
- DECLARE_WRITE8_MEMBER( tmpz84c011_pc_w );
- DECLARE_WRITE8_MEMBER( tmpz84c011_pd_w );
- DECLARE_WRITE8_MEMBER( tmpz84c011_pe_w );
-
- DECLARE_READ8_MEMBER( tmpz84c011_dir_pa_r );
- DECLARE_READ8_MEMBER( tmpz84c011_dir_pb_r );
- DECLARE_READ8_MEMBER( tmpz84c011_dir_pc_r );
- DECLARE_READ8_MEMBER( tmpz84c011_dir_pd_r );
- DECLARE_READ8_MEMBER( tmpz84c011_dir_pe_r );
- DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pa_w );
- DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pb_w );
- DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pc_w );
- DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pd_w );
- DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pe_w );
+ DECLARE_READ8_MEMBER( tmpz84c011_pa_r ) { return (m_inportsa() & ~m_pio_dir[0]) | (m_pio_latch[0] & m_pio_dir[0]); }
+ DECLARE_READ8_MEMBER( tmpz84c011_pb_r ) { return (m_inportsb() & ~m_pio_dir[1]) | (m_pio_latch[1] & m_pio_dir[1]); }
+ DECLARE_READ8_MEMBER( tmpz84c011_pc_r ) { return (m_inportsc() & ~m_pio_dir[2]) | (m_pio_latch[2] & m_pio_dir[2]); }
+ DECLARE_READ8_MEMBER( tmpz84c011_pd_r ) { return (m_inportsd() & ~m_pio_dir[3]) | (m_pio_latch[3] & m_pio_dir[3]); }
+ DECLARE_READ8_MEMBER( tmpz84c011_pe_r ) { return (m_inportse() & ~m_pio_dir[4]) | (m_pio_latch[4] & m_pio_dir[4]); }
+ DECLARE_WRITE8_MEMBER( tmpz84c011_pa_w ) { m_pio_latch[0] = data; m_outportsa(data & m_pio_dir[0]); }
+ DECLARE_WRITE8_MEMBER( tmpz84c011_pb_w ) { m_pio_latch[1] = data; m_outportsb(data & m_pio_dir[1]); }
+ DECLARE_WRITE8_MEMBER( tmpz84c011_pc_w ) { m_pio_latch[2] = data; m_outportsc(data & m_pio_dir[2]); }
+ DECLARE_WRITE8_MEMBER( tmpz84c011_pd_w ) { m_pio_latch[3] = data; m_outportsd(data & m_pio_dir[3]); }
+ DECLARE_WRITE8_MEMBER( tmpz84c011_pe_w ) { m_pio_latch[4] = data; m_outportse(data & m_pio_dir[4]); }
+
+ DECLARE_READ8_MEMBER( tmpz84c011_dir_pa_r ) { return m_pio_dir[0]; }
+ DECLARE_READ8_MEMBER( tmpz84c011_dir_pb_r ) { return m_pio_dir[1]; }
+ DECLARE_READ8_MEMBER( tmpz84c011_dir_pc_r ) { return m_pio_dir[2]; }
+ DECLARE_READ8_MEMBER( tmpz84c011_dir_pd_r ) { return m_pio_dir[3]; }
+ DECLARE_READ8_MEMBER( tmpz84c011_dir_pe_r ) { return m_pio_dir[4]; }
+ DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pa_w ) { m_pio_dir[0] = data; }
+ DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pb_w ) { m_pio_dir[1] = data; }
+ DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pc_w ) { m_pio_dir[2] = data; }
+ DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pd_w ) { m_pio_dir[3] = data; }
+ DECLARE_WRITE8_MEMBER( tmpz84c011_dir_pe_w ) { m_pio_dir[4] = data; }
DECLARE_WRITE_LINE_MEMBER( zc0_cb_trampoline_w ) { m_zc0_cb(state); }
DECLARE_WRITE_LINE_MEMBER( zc1_cb_trampoline_w ) { m_zc1_cb(state); }