Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-07 01:16:22 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

remove trampoline (nw)

Browse Source
This commit is contained in:
Vas Crabb 2017-02-05 17:54:32 +11:00
parent 94e4c48732
commit 726413b495
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/devices/bus/amiga/keyboard/a1200.cpp
View File

@ -13,6 +13,8 @@
#include "a1200.h" #include "a1200.h"
#include "matrix.h" #include "matrix.h"
#include "cpu/m6805/m68hc05.h"
//#define VERBOSE 1 //#define VERBOSE 1
#include "logmacro.h" #include "logmacro.h"
@ -50,7 +52,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_FRAGMENT(a1200kbd_revB) MACHINE_CONFIG_FRAGMENT(a1200kbd_revB)
MCFG_CPU_ADD("mpu", M68HC705C8A, XTAL_3MHz) MCFG_CPU_ADD("mpu", M68HC705C8A, XTAL_3MHz)
MCFG_M68HC05_PORTB_R_CB(READ8(a1200_kbd_device, mpu_portb_r)); 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_PORTA_W_CB(WRITE8(a1200_kbd_device, mpu_porta_w));
MCFG_M68HC05_PORTB_W_CB(WRITE8(a1200_kbd_device, mpu_portb_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)); 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_t(mconfig, A1200_KBD, "Amiga 1200 Keyboard Rev B", tag, owner, clock, "a1200kbd_rb", __FILE__)
, device_amiga_keyboard_interface(mconfig, *this) , device_amiga_keyboard_interface(mconfig, *this)
, m_rows(*this, "ROW%u", 0) , m_rows(*this, "ROW%u", 0)
, m_modifiers(*this, "MOD")
, m_mpu(*this, "mpu") , m_mpu(*this, "mpu")
, m_row_drive(0xffff) , m_row_drive(0xffff)
, m_host_kdat(true) , m_host_kdat(true)
@ -105,11 +106,6 @@ READ8_MEMBER(a1200_kbd_device::mpu_portb_r)
return result; return result;
} }
READ8_MEMBER(a1200_kbd_device::mpu_portd_r)
{
return m_modifiers->read();
}
WRITE8_MEMBER(a1200_kbd_device::mpu_porta_w) WRITE8_MEMBER(a1200_kbd_device::mpu_porta_w)
{ {
m_row_drive = (m_row_drive & 0xff00) | u16(u8(data | ~mem_mask)); m_row_drive = (m_row_drive & 0xff00) | u16(u8(data | ~mem_mask));

13
src/devices/bus/amiga/keyboard/a1200.h
View File

@ -12,7 +12,6 @@
#pragma once #pragma once
#include "keyboard.h" #include "keyboard.h"
#include "cpu/m6805/m68hc05.h"
//************************************************************************** //**************************************************************************
@ -39,9 +38,8 @@ public:
// from host // from host
virtual DECLARE_WRITE_LINE_MEMBER(kdat_w) override; virtual DECLARE_WRITE_LINE_MEMBER(kdat_w) override;
// mpu I/O // MPU I/O
DECLARE_READ8_MEMBER(mpu_portb_r); DECLARE_READ8_MEMBER(mpu_portb_r);
DECLARE_READ8_MEMBER(mpu_portd_r);
DECLARE_WRITE8_MEMBER(mpu_porta_w); DECLARE_WRITE8_MEMBER(mpu_porta_w);
DECLARE_WRITE8_MEMBER(mpu_portb_w); DECLARE_WRITE8_MEMBER(mpu_portb_w);
DECLARE_WRITE8_MEMBER(mpu_portc_w); DECLARE_WRITE8_MEMBER(mpu_portc_w);
@ -56,12 +54,11 @@ protected:
virtual void device_reset() override; virtual void device_reset() override;
private: private:
required_ioport_array<15> m_rows; required_ioport_array<15> m_rows;
required_ioport m_modifiers; required_device<cpu_device> m_mpu;
required_device<m68hc05_device> m_mpu;
u16 m_row_drive; u16 m_row_drive;
bool m_host_kdat, m_mpu_kdat; bool m_host_kdat, m_mpu_kdat;
}; };
} } } // namespace bus::amiga::keyboard } } } // namespace bus::amiga::keyboard