diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp index 7b79d75a3e8..c9588ca0a8a 100644 --- a/src/devices/bus/amiga/keyboard/a1200.cpp +++ b/src/devices/bus/amiga/keyboard/a1200.cpp @@ -13,6 +13,8 @@ #include "a1200.h" #include "matrix.h" +#include "cpu/m6805/m68hc05.h" + //#define VERBOSE 1 #include "logmacro.h" @@ -50,7 +52,7 @@ INPUT_PORTS_END MACHINE_CONFIG_FRAGMENT(a1200kbd_revB) MCFG_CPU_ADD("mpu", M68HC705C8A, XTAL_3MHz) MCFG_M68HC05_PORTB_R_CB(READ8(a1200_kbd_device, mpu_portb_r)); - MCFG_M68HC05_PORTD_R_CB(READ8(a1200_kbd_device, mpu_portd_r)); + MCFG_M68HC05_PORTD_R_CB(IOPORT("MOD")); MCFG_M68HC05_PORTA_W_CB(WRITE8(a1200_kbd_device, mpu_porta_w)); MCFG_M68HC05_PORTB_W_CB(WRITE8(a1200_kbd_device, mpu_portb_w)); MCFG_M68HC05_PORTC_W_CB(WRITE8(a1200_kbd_device, mpu_portc_w)); @@ -75,7 +77,6 @@ a1200_kbd_device::a1200_kbd_device(machine_config const &mconfig, char const *ta : device_t(mconfig, A1200_KBD, "Amiga 1200 Keyboard Rev B", tag, owner, clock, "a1200kbd_rb", __FILE__) , device_amiga_keyboard_interface(mconfig, *this) , m_rows(*this, "ROW%u", 0) - , m_modifiers(*this, "MOD") , m_mpu(*this, "mpu") , m_row_drive(0xffff) , m_host_kdat(true) @@ -105,11 +106,6 @@ READ8_MEMBER(a1200_kbd_device::mpu_portb_r) return result; } -READ8_MEMBER(a1200_kbd_device::mpu_portd_r) -{ - return m_modifiers->read(); -} - WRITE8_MEMBER(a1200_kbd_device::mpu_porta_w) { m_row_drive = (m_row_drive & 0xff00) | u16(u8(data | ~mem_mask)); diff --git a/src/devices/bus/amiga/keyboard/a1200.h b/src/devices/bus/amiga/keyboard/a1200.h index b2cbd511e1a..f29689b18e3 100644 --- a/src/devices/bus/amiga/keyboard/a1200.h +++ b/src/devices/bus/amiga/keyboard/a1200.h @@ -12,7 +12,6 @@ #pragma once #include "keyboard.h" -#include "cpu/m6805/m68hc05.h" //************************************************************************** @@ -39,9 +38,8 @@ public: // from host virtual DECLARE_WRITE_LINE_MEMBER(kdat_w) override; - // mpu I/O + // MPU I/O DECLARE_READ8_MEMBER(mpu_portb_r); - DECLARE_READ8_MEMBER(mpu_portd_r); DECLARE_WRITE8_MEMBER(mpu_porta_w); DECLARE_WRITE8_MEMBER(mpu_portb_w); DECLARE_WRITE8_MEMBER(mpu_portc_w); @@ -56,12 +54,11 @@ protected: virtual void device_reset() override; private: - required_ioport_array<15> m_rows; - required_ioport m_modifiers; - required_device m_mpu; + required_ioport_array<15> m_rows; + required_device m_mpu; - u16 m_row_drive; - bool m_host_kdat, m_mpu_kdat; + u16 m_row_drive; + bool m_host_kdat, m_mpu_kdat; }; } } } // namespace bus::amiga::keyboard