From a91c079afb1db0e9644436624702cee84e97fa7f Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Tue, 6 Mar 2018 19:30:18 +0000 Subject: [PATCH] kr2376: Added keyboard matrix callbacks. --- src/devices/machine/kr2376.cpp | 321 +++++++++++++-------------------- src/devices/machine/kr2376.h | 63 ++++++- src/mame/drivers/z80ne.cpp | 43 +++-- src/mame/includes/z80ne.h | 14 +- src/mame/machine/z80ne.cpp | 36 ++-- 5 files changed, 245 insertions(+), 232 deletions(-) diff --git a/src/devices/machine/kr2376.cpp b/src/devices/machine/kr2376.cpp index 8d082180f72..1a602559ad5 100644 --- a/src/devices/machine/kr2376.cpp +++ b/src/devices/machine/kr2376.cpp @@ -9,69 +9,129 @@ #include "emu.h" #include "kr2376.h" -static const uint8_t KR2376_KEY_CODES[3][8][11] = -{ - // normal - { - // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 - // NUL SOH STX ETX EOT ENQ ACK BEL DC1 P O X0 - { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x11, 0x50, 0x30 }, // X0 - // DLE K L N M NAK SYN ETB CAN EM SUB X1 - { 0x10, 0x4b, 0x4c, 0x4e, 0x4d, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a }, // X1 - // - FS GS RS US < > , SP . _ X2 - { 0x2d, 0x1c, 0x1d, 0x1e, 0x1f, 0x3c, 0x3e, 0x2c, 0x20, 0x2e, 0x5f }, // X2 - // 0 : p _ @ BS [ ] CR LF DEL X3 - { 0x30, 0x3a, 0x70, 0x5f, 0x40, 0x08, 0x5B, 0x5d, 0x0d, 0x0a, 0x7f }, // X3 - { 0x3b, 0x2f, 0x2e, 0x2c, 0x6d, 0x6e, 0x62, 0x76, 0x63, 0x78, 0x7a }, // X4 - { 0x6c, 0x6b, 0x6a, 0x68, 0x67, 0x66, 0x64, 0x73, 0x61, 0x0c, 0x1b }, // X5 - { 0x6f, 0x69, 0x75, 0x79, 0x74, 0x72, 0x65, 0x77, 0x71, 0x09, 0x0b }, // X6 - { 0x39, 0x38, 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x5e, 0x5c } // X7 - }, - // shift - { - // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 - // NUL SOH STX ETX EOT ENQ ACK BEL DC1 @ _ X0 - { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x11, 0x40, 0x5f }, // X0 - // DLE [ \ ^ ] NAK SYN ETB CAN EM SUB X1 - { 0x10, 0x5b, 0x5c, 0x5e, 0x5d, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a }, // X1 - // = FS GS RS US < > , SP . _ X2 - { 0x3d, 0x1c, 0x1d, 0x1e, 0x1f, 0x3c, 0x3e, 0x2c, 0x20, 0x2e, 0x5f }, // X2 - // NUL * P DEL ` BS { } CR LF DEL X3 - { 0x00, 0x2a, 0x50, 0x7f, 0x60, 0x08, 0x7b, 0x7d, 0x0d, 0x0a, 0x7f }, // X3 - { 0x2b, 0x3f, 0x3e, 0x3c, 0x4d, 0x4e, 0x42, 0x56, 0x43, 0x58, 0x5a }, // X4 - { 0x4c, 0x4b, 0x4a, 0x48, 0x47, 0x46, 0x44, 0x53, 0x41, 0x0c, 0x1b }, // X5 - { 0x4f, 0x49, 0x55, 0x59, 0x54, 0x52, 0x45, 0x57, 0x51, 0x09, 0x0b }, // X6 - { 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x7e, 0x7c } // X7 - }, +DEFINE_DEVICE_TYPE(KR2376_ST, kr2376_st_device, "kr2376_st", "SMC KR2376-ST Keyboard Encoder") +//DEFINE_DEVICE_TYPE(KR2376_12, kr2376_12_device, "kr2376_12", "SMC KR2376-12 Keyboard Encoder") - // control - { - // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 - // NUL SOH STX ETX EOT ENQ ACK BEL DC1 DLE SI X0 - { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x11, 0x10, 0x0f }, // X0 - // DLE VT FF SO CR NAK SYN ETB CAN EM SUB X1 - { 0x10, 0x0b, 0x0c, 0x0e, 0x0d, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a }, // X1 - // NUL FS GS RS US NUL NUL NUL SP NUL US X2 - { 0x00, 0x1c, 0x1d, 0x1e, 0x1f, 0x00, 0x00, 0x00, 0x20, 0x00, 0x1f }, // X2 - // NUL NUL DLE US NUL BS ESC GS CR LF DEL X3 - { 0x00, 0x00, 0x10, 0x1f, 0x00, 0x08, 0x1B, 0x1d, 0x0d, 0x0a, 0x7f }, // X3 - { 0x00, 0x00, 0x00, 0x00, 0x1d, 0x0e, 0x02, 0x16, 0x03, 0x18, 0x1a }, // X4 - { 0x0c, 0x0b, 0x0a, 0x08, 0x07, 0x06, 0x04, 0x13, 0x01, 0x0c, 0x1b }, // X5 - { 0x1f, 0x09, 0x15, 0x19, 0x14, 0x12, 0x05, 0x17, 0x11, 0x09, 0x0b }, // X6 - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1c } // X7 - } -}; - - -DEFINE_DEVICE_TYPE(KR2376, kr2376_device, "kr2376", "SMC KR2376 Keyboard Encoder") - -kr2376_device::kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, KR2376, tag, owner, clock), +kr2376_device::kr2376_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, type, tag, owner, clock), + m_read_x{ {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this} }, + m_read_shift(*this), + m_read_control(*this), m_write_strobe(*this) { } +kr2376_st_device::kr2376_st_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : kr2376_device(mconfig, KR2376_ST, tag, owner, clock) +{} +uint8_t kr2376_st_device::key_codes(int mode, int x, int y) +{ + static const uint8_t KEY_CODES[3][8][11] = + { + // normal + { + // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 + // NUL SOH STX ETX EOT ENQ ACK BEL DC1 P O X0 + { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x11, 0x50, 0x30 }, // X0 + // DLE K L N M NAK SYN ETB CAN EM SUB X1 + { 0x10, 0x4b, 0x4c, 0x4e, 0x4d, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a }, // X1 + // - FS GS RS US < > , SP . _ X2 + { 0x2d, 0x1c, 0x1d, 0x1e, 0x1f, 0x3c, 0x3e, 0x2c, 0x20, 0x2e, 0x5f }, // X2 + // 0 : p _ @ BS [ ] CR LF DEL X3 + { 0x30, 0x3a, 0x70, 0x5f, 0x40, 0x08, 0x5B, 0x5d, 0x0d, 0x0a, 0x7f }, // X3 + { 0x3b, 0x2f, 0x2e, 0x2c, 0x6d, 0x6e, 0x62, 0x76, 0x63, 0x78, 0x7a }, // X4 + { 0x6c, 0x6b, 0x6a, 0x68, 0x67, 0x66, 0x64, 0x73, 0x61, 0x0c, 0x1b }, // X5 + { 0x6f, 0x69, 0x75, 0x79, 0x74, 0x72, 0x65, 0x77, 0x71, 0x09, 0x0b }, // X6 + { 0x39, 0x38, 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x5e, 0x5c } // X7 + }, + + // shift + { + // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 + // NUL SOH STX ETX EOT ENQ ACK BEL DC1 @ _ X0 + { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x11, 0x40, 0x5f }, // X0 + // DLE [ \ ^ ] NAK SYN ETB CAN EM SUB X1 + { 0x10, 0x5b, 0x5c, 0x5e, 0x5d, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a }, // X1 + // = FS GS RS US < > , SP . _ X2 + { 0x3d, 0x1c, 0x1d, 0x1e, 0x1f, 0x3c, 0x3e, 0x2c, 0x20, 0x2e, 0x5f }, // X2 + // NUL * P DEL ` BS { } CR LF DEL X3 + { 0x00, 0x2a, 0x50, 0x7f, 0x60, 0x08, 0x7b, 0x7d, 0x0d, 0x0a, 0x7f }, // X3 + { 0x2b, 0x3f, 0x3e, 0x3c, 0x4d, 0x4e, 0x42, 0x56, 0x43, 0x58, 0x5a }, // X4 + { 0x4c, 0x4b, 0x4a, 0x48, 0x47, 0x46, 0x44, 0x53, 0x41, 0x0c, 0x1b }, // X5 + { 0x4f, 0x49, 0x55, 0x59, 0x54, 0x52, 0x45, 0x57, 0x51, 0x09, 0x0b }, // X6 + { 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0x7e, 0x7c } // X7 + }, + + // control + { + // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 + // NUL SOH STX ETX EOT ENQ ACK BEL DC1 DLE SI X0 + { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x11, 0x10, 0x0f }, // X0 + // DLE VT FF SO CR NAK SYN ETB CAN EM SUB X1 + { 0x10, 0x0b, 0x0c, 0x0e, 0x0d, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a }, // X1 + // NUL FS GS RS US NUL NUL NUL SP NUL US X2 + { 0x00, 0x1c, 0x1d, 0x1e, 0x1f, 0x00, 0x00, 0x00, 0x20, 0x00, 0x1f }, // X2 + // NUL NUL DLE US NUL BS ESC GS CR LF DEL X3 + { 0x00, 0x00, 0x10, 0x1f, 0x00, 0x08, 0x1B, 0x1d, 0x0d, 0x0a, 0x7f }, // X3 + { 0x00, 0x00, 0x00, 0x00, 0x1d, 0x0e, 0x02, 0x16, 0x03, 0x18, 0x1a }, // X4 + { 0x0c, 0x0b, 0x0a, 0x08, 0x07, 0x06, 0x04, 0x13, 0x01, 0x0c, 0x1b }, // X5 + { 0x1f, 0x09, 0x15, 0x19, 0x14, 0x12, 0x05, 0x17, 0x11, 0x09, 0x0b }, // X6 + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1c } // X7 + } + }; + return KEY_CODES[mode][x][y]; +} + +// TODO: determine ROM contents of KR2376-12 +//kr2376_12_device::kr2376_12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +// : kr2376_device(mconfig, KR2376_12, tag, owner, clock) +//{} +//uint8_t kr2376_12_device::key_codes(int mode, int x, int y) +//{ +// static const uint8_t KEY_CODES[3][8][11] = +// { +// // normal +// { +// // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 +// { 0x33, 0x32, 0x31, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X0 +// { 0x36, 0x35, 0x34, 0x7d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X1 +// { 0x39, 0x38, 0x37, 0x5b, 0x02, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00 }, // X2 +// { 0x08, 0x0a, 0x09, 0x0b, 0x00, 0x7c, 0x00, 0x00, 0x0d, 0x20, 0x00 }, // X3 +// { 0x2d, 0x2f, 0x2e, 0x2c, 0x6d, 0x6e, 0x62, 0x76, 0x63, 0x78, 0x7a }, // X4 +// { 0x3a, 0x3b, 0x6c, 0x6b, 0x6a, 0x68, 0x67, 0x66, 0x64, 0x73, 0x61 }, // X5 +// { 0x60, 0x70, 0x6f, 0x69, 0x75, 0x79, 0x74, 0x72, 0x65, 0x77, 0x71 }, // X6 +// { 0x2d, 0x30, 0x39, 0x38, 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31 } // X7 +// }, +// +// // shift +// { +// // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 +// { 0x33, 0x32, 0x31, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X0 +// { 0x36, 0x35, 0x34, 0x5d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X1 +// { 0x39, 0x38, 0x37, 0x7b, 0x04, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00 }, // X2 +// { 0x08, 0x0a, 0x09, 0x0b, 0x00, 0x5c, 0x00, 0x00, 0x0d, 0x20, 0x00 }, // X3 +// { 0x2d, 0x3f, 0x3e, 0x3c, 0x4d, 0x4e, 0x42, 0x56, 0x43, 0x58, 0x5a }, // X4 +// { 0x2a, 0x2b, 0x4c, 0x4b, 0x4a, 0x48, 0x47, 0x46, 0x44, 0x53, 0x41 }, // X5 +// { 0x40, 0x50, 0x4f, 0x49, 0x55, 0x59, 0x54, 0x52, 0x45, 0x57, 0x51 }, // X6 +// { 0x3d, 0x30, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21 } // X7 +// }, +// +// // control +// { +// // Y0 Y1 Y2 Y3 Y4 Y5 Y6 Y7 Y8 Y9 Y10 +// { 0x33, 0x32, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X0 +// { 0x36, 0x35, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // X1 +// { 0x39, 0x38, 0x37, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00 }, // X2 +// { 0x08, 0x0a, 0x09, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x20, 0x00 }, // X3 +// { 0x1f, 0x2f, 0x2e, 0x2c, 0x0d, 0x0e, 0x02, 0x16, 0x03, 0x18, 0x1a }, // X4 +// { 0x3a, 0x3b, 0x0c, 0x0b, 0x0a, 0x08, 0x07, 0x06, 0x04, 0x13, 0x01 }, // X5 +// { 0x00, 0x10, 0x0f, 0x09, 0x15, 0x19, 0x14, 0x12, 0x05, 0x17, 0x11 }, // X6 +// { 0x2d, 0x30, 0x39, 0x38, 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31 } // X7 +// } +// }; +// return KEY_CODES[mode][x][y]; +//} //------------------------------------------------- // device_start - device-specific startup @@ -79,12 +139,18 @@ kr2376_device::kr2376_device(const machine_config &mconfig, const char *tag, dev void kr2376_device::device_start() { + /* resolve callbacks */ + for (int i = 0; i < 8; i++) + { + m_read_x[i].resolve_safe(0x7ff); + } + m_read_shift.resolve_safe(0); + m_read_control.resolve_safe(0); m_write_strobe.resolve_safe(); /* set initial values */ m_ring11 = 0; m_ring8 = 0; - m_modifiers = 0; m_strobe = 0; m_strobe_old = 0; m_parity = 0; @@ -100,7 +166,6 @@ void kr2376_device::device_start() save_item(NAME(m_pins)); save_item(NAME(m_ring11)); save_item(NAME(m_ring8)); - save_item(NAME(m_modifiers)); save_item(NAME(m_strobe)); save_item(NAME(m_strobe_old)); save_item(NAME(m_parity)); @@ -166,29 +231,24 @@ void kr2376_device::clock_scan_counters() void kr2376_device::detect_keypress() { - static const char *const keynames[] = { "X0", "X1", "X2", "X3", "X4", "X5", "X6", "X7" }; - - if (ioport(keynames[m_ring8])->read() == (1 << m_ring11)) + if (m_read_x[m_ring8]() == (1 << m_ring11)) { - m_modifiers = ioport("MODIFIERS")->read(); - m_strobe = 1; /* strobe 0->1 transition, encode char and update parity */ if (!m_strobe_old) { int i; int parbit; - int shift = BIT(m_modifiers, 0); - int control = BIT(m_modifiers, 1); - int alpha = BIT(m_modifiers, 2); + int shift = m_read_shift(); + int control = m_read_control(); int table = 0; - if (shift || alpha) + if (shift) table = 1; else if (control) table = 2; - m_data = KR2376_KEY_CODES[table][m_ring8][m_ring11]; + m_data = key_codes(table, m_ring8, m_ring11); /* Compute ODD parity */ m_parity = m_data; @@ -225,126 +285,3 @@ READ8_MEMBER( kr2376_device::data_r ) else return m_data; } - -/* Input Ports */ - -INPUT_PORTS_START( kr2376 ) - PORT_START("X0") - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) - - PORT_START("X1") - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) - - - PORT_START("X2") - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=') - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CHAR('_') - - PORT_START("X3") - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('*') - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('`') PORT_CHAR('@') - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) PORT_NAME("Del") - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{') - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}') - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_NAME("CR") - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_CHAR(10) PORT_NAME("LF") - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) - - PORT_START("X4") - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+') - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') - - - PORT_START("X5") - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('c') PORT_CHAR('G') - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) - - - PORT_START("X6") - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') - - PORT_START("X7") - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') - PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"') - PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('^') PORT_CHAR('~') - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|') - - PORT_START("MODIFIERS") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_MAMEKEY(LCONTROL)) PORT_CHAR(UCHAR_MAMEKEY(RCONTROL)) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) -INPUT_PORTS_END - -//------------------------------------------------- -// input_ports - device-specific input ports -//------------------------------------------------- - -ioport_constructor kr2376_device::device_input_ports() const -{ - return INPUT_PORTS_NAME( kr2376 ); -} diff --git a/src/devices/machine/kr2376.h b/src/devices/machine/kr2376.h index 3b25d0c527c..8b8d23e290e 100644 --- a/src/devices/machine/kr2376.h +++ b/src/devices/machine/kr2376.h @@ -35,8 +35,32 @@ #pragma once -#define MCFG_KR2376_STROBE_CALLBACK(_write) \ - devcb = &downcast(*device).set_strobe_wr_callback(DEVCB_##_write); +//************************************************************************** +// INTERFACE CONFIGURATION MACROS +//************************************************************************** + +#define MCFG_KR2376_MATRIX_X0(_cb) \ + devcb = &downcast(*device).set_x_cb<0>(DEVCB_##_cb); +#define MCFG_KR2376_MATRIX_X1(_cb) \ + devcb = &downcast(*device).set_x_cb<1>(DEVCB_##_cb); +#define MCFG_KR2376_MATRIX_X2(_cb) \ + devcb = &downcast(*device).set_x_cb<2>(DEVCB_##_cb); +#define MCFG_KR2376_MATRIX_X3(_cb) \ + devcb = &downcast(*device).set_x_cb<3>(DEVCB_##_cb); +#define MCFG_KR2376_MATRIX_X4(_cb) \ + devcb = &downcast(*device).set_x_cb<4>(DEVCB_##_cb); +#define MCFG_KR2376_MATRIX_X5(_cb) \ + devcb = &downcast(*device).set_x_cb<5>(DEVCB_##_cb); +#define MCFG_KR2376_MATRIX_X6(_cb) \ + devcb = &downcast(*device).set_x_cb<6>(DEVCB_##_cb); +#define MCFG_KR2376_MATRIX_X7(_cb) \ + devcb = &downcast(*device).set_x_cb<7>(DEVCB_##_cb); +#define MCFG_KR2376_SHIFT_CB(_cb) \ + devcb = &downcast(*device).set_shift_cb(DEVCB_##_cb); +#define MCFG_KR2376_CONTROL_CB(_cb) \ + devcb = &downcast(*device).set_control_cb(DEVCB_##_cb); +#define MCFG_KR2376_STROBE_CB(_cb) \ + devcb = &downcast(*device).set_strobe_cb(DEVCB_##_cb); class kr2376_device : public device_t { @@ -53,12 +77,15 @@ public: enum output_pin_t { KR2376_SO=16, /* SO - Pin 16 - Strobe Output */ - KR2376_PO=7 /* PO - Pin 7 - Parity Output */ + KR2376_PO=7 /* PO - Pin 7 - Parity Output */ }; - kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + kr2376_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - template devcb_base &set_strobe_wr_callback(Object &&cb) { return m_write_strobe.set_callback(std::forward(cb)); } + template devcb_base &set_x_cb(Object &&cb) { return m_read_x[N].set_callback(std::forward(cb)); } + template devcb_base &set_shift_cb(Object &&cb) { return m_read_shift.set_callback(std::forward(cb)); } + template devcb_base &set_control_cb(Object &&cb) { return m_read_control.set_callback(std::forward(cb)); } + template devcb_base &set_strobe_cb(Object &&cb) { return m_write_strobe.set_callback(std::forward(cb)); } /* keyboard data */ DECLARE_READ8_MEMBER( data_r ); @@ -73,7 +100,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual ioport_constructor device_input_ports() const override; + virtual uint8_t key_codes(int mode, int x, int y) { return 0x00; } private: // internal state @@ -81,7 +108,6 @@ private: int m_ring11; /* sense input scan counter */ int m_ring8; /* drive output scan counter */ - int m_modifiers; /* modifier inputs */ int m_strobe; /* strobe output */ int m_strobe_old; @@ -90,6 +116,8 @@ private: /* timers */ emu_timer *m_scan_timer; /* keyboard scan timer */ + devcb_read16 m_read_x[8]; + devcb_read_line m_read_shift, m_read_control; devcb_write_line m_write_strobe; enum @@ -102,6 +130,25 @@ private: void detect_keypress(); }; -DECLARE_DEVICE_TYPE(KR2376, kr2376_device) +class kr2376_st_device : public kr2376_device +{ +public: + // construction/destruction + kr2376_st_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: + virtual uint8_t key_codes(int mode, int x, int y) override; +}; + +//class kr2376_12_device : public kr2376_device +//{ +//public: +// // construction/destruction +// kr2376_12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +//protected: +// virtual uint8_t key_codes(int mode, int x, int y) override; +//}; + +DECLARE_DEVICE_TYPE(KR2376_ST, kr2376_st_device) +//DECLARE_DEVICE_TYPE(KR2376_12, kr2376_12_device) #endif // MAME_MACHINE_KR2376_H diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp index b188d48ac45..3483dcf2587 100644 --- a/src/mame/drivers/z80ne.cpp +++ b/src/mame/drivers/z80ne.cpp @@ -145,7 +145,7 @@ ADDRESS_MAP_END ADDRESS_MAP_START(z80ne_state::z80net_io) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0xea, 0xea) AM_READ(lx388_data_r ) + AM_RANGE(0xea, 0xea) AM_READ(lx387_data_r ) AM_RANGE(0xeb, 0xeb) AM_READ(lx388_read_field_sync ) AM_RANGE(0xee, 0xee) AM_DEVREADWRITE("uart", ay31015_device, receive, transmit) AM_RANGE(0xef, 0xef) AM_READWRITE(lx385_ctrl_r, lx385_ctrl_w ) @@ -168,7 +168,7 @@ ADDRESS_MAP_END ADDRESS_MAP_START(z80ne_state::z80netf_io) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0xd0, 0xd7) AM_READWRITE(lx390_fdc_r, lx390_fdc_w) - AM_RANGE(0xea, 0xea) AM_READ(lx388_data_r ) + AM_RANGE(0xea, 0xea) AM_READ(lx387_data_r ) AM_RANGE(0xeb, 0xeb) AM_READ(lx388_read_field_sync ) AM_RANGE(0xee, 0xee) AM_DEVREADWRITE("uart", ay31015_device, receive, transmit) AM_RANGE(0xef, 0xef) AM_READWRITE(lx385_ctrl_r, lx385_ctrl_w ) @@ -237,11 +237,11 @@ static INPUT_PORTS_START( z80net ) PORT_INCLUDE( z80ne ) -/* LX.388 Keyboard BREAK key */ -PORT_START("LX388_BRK") +/* LX.387 Keyboard BREAK key */ +PORT_START("LX387_BRK") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Break") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT)) PORT_CHANGED_MEMBER(DEVICE_SELF, z80ne_state, z80ne_nmi, nullptr) -/* LX.388 Keyboard (Encoded by KR2376) */ +/* LX.387 Keyboard (Encoded by KR2376) */ PORT_START("X0") PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -269,7 +269,6 @@ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START("X2") PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=') PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -309,7 +308,6 @@ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) P PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') - PORT_START("X5") PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') @@ -323,7 +321,6 @@ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) P PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) - PORT_START("X6") PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') @@ -351,7 +348,7 @@ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) P PORT_START("MODIFIERS") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_MAMEKEY(LCONTROL)) PORT_CHAR(UCHAR_MAMEKEY(RCONTROL)) -PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Alpha Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) +PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_TOGGLE INPUT_PORTS_END @@ -398,7 +395,7 @@ static const uint32_t lx388palette[] = rgb_t(0x00, 0x20, 0x00), /* ALPHANUMERIC DARK GREEN */ rgb_t(0x00, 0xff, 0x00), /* ALPHANUMERIC BRIGHT GREEN */ rgb_t(0x40, 0x10, 0x00), /* ALPHANUMERIC DARK ORANGE */ - rgb_t(0xff, 0xc4, 0x18) /* ALPHANUMERIC BRIGHT ORANGE */ + rgb_t(0xff, 0xc4, 0x18) /* ALPHANUMERIC BRIGHT ORANGE */ }; #endif @@ -451,7 +448,17 @@ MACHINE_CONFIG_START(z80ne_state::z80net) MCFG_MACHINE_START_OVERRIDE(z80ne_state, z80net ) MCFG_MACHINE_RESET_OVERRIDE(z80ne_state, z80net ) - MCFG_DEVICE_ADD("lx388_kr2376", KR2376, 50000) + MCFG_DEVICE_ADD("lx387_kr2376", KR2376_ST, 50000) + MCFG_KR2376_MATRIX_X0(IOPORT("X0")) + MCFG_KR2376_MATRIX_X1(IOPORT("X1")) + MCFG_KR2376_MATRIX_X2(IOPORT("X2")) + MCFG_KR2376_MATRIX_X3(IOPORT("X3")) + MCFG_KR2376_MATRIX_X4(IOPORT("X4")) + MCFG_KR2376_MATRIX_X5(IOPORT("X5")) + MCFG_KR2376_MATRIX_X6(IOPORT("X6")) + MCFG_KR2376_MATRIX_X7(IOPORT("X7")) + MCFG_KR2376_SHIFT_CB(READLINE(z80ne_state, lx387_shift_r)) + MCFG_KR2376_CONTROL_CB(READLINE(z80ne_state, lx387_control_r)) /* video hardware */ MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847") @@ -492,7 +499,17 @@ MACHINE_CONFIG_START(z80ne_state::z80netb) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("z80ne_cass") - MCFG_DEVICE_ADD("lx388_kr2376", KR2376, 50000) + MCFG_DEVICE_ADD("lx387_kr2376", KR2376_ST, 50000) + MCFG_KR2376_MATRIX_X0(IOPORT("X0")) + MCFG_KR2376_MATRIX_X1(IOPORT("X1")) + MCFG_KR2376_MATRIX_X2(IOPORT("X2")) + MCFG_KR2376_MATRIX_X3(IOPORT("X3")) + MCFG_KR2376_MATRIX_X4(IOPORT("X4")) + MCFG_KR2376_MATRIX_X5(IOPORT("X5")) + MCFG_KR2376_MATRIX_X6(IOPORT("X6")) + MCFG_KR2376_MATRIX_X7(IOPORT("X7")) + MCFG_KR2376_SHIFT_CB(READLINE(z80ne_state, lx387_shift_r)) + MCFG_KR2376_CONTROL_CB(READLINE(z80ne_state, lx387_control_r)) /* video hardware */ MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847") @@ -533,7 +550,7 @@ MACHINE_CONFIG_START(z80ne_state::z80netf) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("z80ne_cass") - MCFG_DEVICE_ADD("lx388_kr2376", KR2376, 50000) + MCFG_DEVICE_ADD("lx387_kr2376", KR2376_ST, 50000) /* video hardware */ MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847") diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h index 2a150606ea4..fcc19899b33 100644 --- a/src/mame/includes/z80ne.h +++ b/src/mame/includes/z80ne.h @@ -74,7 +74,7 @@ public: m_vdg(*this, "mc6847"), m_videoram(*this, "videoram"), m_uart(*this, "uart"), - m_lx388_kr2376(*this, "lx388_kr2376"), + m_lx387_kr2376(*this, "lx387_kr2376"), m_maincpu(*this, "z80ne"), m_floppy0(*this, "wd1771:0"), m_floppy1(*this, "wd1771:1"), @@ -93,7 +93,7 @@ public: m_io_ctrl(*this, "CTRL"), m_io_rst(*this, "RST"), m_io_lx_385(*this, "LX.385"), - m_io_lx388_brk(*this, "LX388_BRK"), + m_io_lx387_brk(*this, "LX387_BRK"), m_io_x0(*this, "X0"), m_io_x1(*this, "X1"), m_io_x2(*this, "X2"), @@ -110,7 +110,7 @@ public: optional_device m_vdg; optional_shared_ptr m_videoram; required_device m_uart; - optional_device m_lx388_kr2376; + optional_device m_lx387_kr2376; uint8_t m_lx383_scan_counter; uint8_t m_lx383_key[LX383_KEYS]; int m_lx383_downsampler; @@ -123,7 +123,9 @@ public: DECLARE_WRITE8_MEMBER(lx383_w); DECLARE_READ8_MEMBER(lx385_ctrl_r); DECLARE_WRITE8_MEMBER(lx385_ctrl_w); - DECLARE_READ8_MEMBER(lx388_data_r); + DECLARE_READ_LINE_MEMBER(lx387_shift_r); + DECLARE_READ_LINE_MEMBER(lx387_control_r); + DECLARE_READ8_MEMBER(lx387_data_r); DECLARE_READ8_MEMBER(lx388_read_field_sync); DECLARE_DRIVER_INIT(z80netf); DECLARE_DRIVER_INIT(z80net); @@ -180,7 +182,7 @@ protected: required_ioport m_io_ctrl; required_ioport m_io_rst; required_ioport m_io_lx_385; - optional_ioport m_io_lx388_brk; + optional_ioport m_io_lx387_brk; optional_ioport m_io_x0; optional_ioport m_io_x1; optional_ioport m_io_x2; @@ -196,7 +198,7 @@ protected: emu_timer *m_timer_reset; cassette_image_device *cassette_device_image(); - void reset_lx388(); + void reset_lx387(); void reset_lx382_banking(); void reset_lx390_banking(); }; diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp index 7b676b16628..697c2393c1f 100644 --- a/src/mame/machine/z80ne.cpp +++ b/src/mame/machine/z80ne.cpp @@ -165,10 +165,10 @@ void z80ne_state::device_timer(emu_timer &timer, device_timer_id id, int param, } } -void z80ne_state::reset_lx388() +void z80ne_state::reset_lx387() { - m_lx388_kr2376->set_input_pin( kr2376_device::KR2376_DSII, 0); - m_lx388_kr2376->set_input_pin( kr2376_device::KR2376_PII, 0); + m_lx387_kr2376->set_input_pin( kr2376_device::KR2376_DSII, 0); + m_lx387_kr2376->set_input_pin( kr2376_device::KR2376_PII, 0); } void z80ne_state::reset_lx382_banking() @@ -297,14 +297,14 @@ MACHINE_RESET_MEMBER(z80ne_state,z80net) { LOG("In machine_reset z80net\n"); MACHINE_RESET_CALL_MEMBER( z80ne ); - reset_lx388(); + reset_lx387(); } MACHINE_RESET_MEMBER(z80ne_state,z80netb) { LOG("In machine_reset z80netb\n"); MACHINE_RESET_CALL_MEMBER( z80ne_base ); - reset_lx388(); + reset_lx387(); } MACHINE_RESET_MEMBER(z80ne_state,z80netf) @@ -312,7 +312,7 @@ MACHINE_RESET_MEMBER(z80ne_state,z80netf) LOG("In machine_reset z80netf\n"); reset_lx390_banking(); MACHINE_RESET_CALL_MEMBER( z80ne_base ); - reset_lx388(); + reset_lx387(); } INPUT_CHANGED_MEMBER(z80ne_state::z80ne_reset) @@ -329,7 +329,7 @@ INPUT_CHANGED_MEMBER(z80ne_state::z80ne_reset) INPUT_CHANGED_MEMBER(z80ne_state::z80ne_nmi) { uint8_t nmi; - nmi = m_io_lx388_brk->read(); + nmi = m_io_lx387_brk->read(); if ( ! BIT(nmi, 0)) { @@ -404,8 +404,8 @@ WRITE8_MEMBER(z80ne_state::lx383_w) * First 8 locations (F0-F7) are mapped to a dual-port 8-byte RAM * The 1KHz NE-555 astable oscillator circuit drive * a 4-bit 74LS93 binary counter. - * The 3 least sigificant bits of the counter are connected - * both to the read addres of the dual-port ram and to + * The 3 least significant bits of the counter are connected + * both to the read address of the dual-port ram and to * a 74LS156 3 to 8 binary decoder driving the cathode * of 8 7-segments LEDS. * The data output of the dual-port ram drive the anodes @@ -421,7 +421,7 @@ WRITE8_MEMBER(z80ne_state::lx383_w) * P 0x80 (represented by DP in original schematics) * * A write in the range F0-FF starts a 74LS90 counter - * that trigger the NMI line of the CPU afther 2 instruction + * that trigger the NMI line of the CPU after 2 instruction * fetch cycles for single step execution. */ @@ -556,6 +556,16 @@ WRITE8_MEMBER(z80ne_state::lx385_ctrl_w) } } +READ_LINE_MEMBER(z80ne_state::lx387_shift_r) +{ + return BIT(m_io_modifiers->read(), 0) || BIT(m_io_modifiers->read(), 2); +} + +READ_LINE_MEMBER(z80ne_state::lx387_control_r) +{ + return BIT(m_io_modifiers->read(), 1); +} + READ8_MEMBER(z80ne_state::lx388_mc6847_videoram_r) { if (offset == ~0) return 0xff; @@ -571,12 +581,12 @@ READ8_MEMBER(z80ne_state::lx388_mc6847_videoram_r) return videoram[offset]; } -READ8_MEMBER(z80ne_state::lx388_data_r) +READ8_MEMBER(z80ne_state::lx387_data_r) { uint8_t data; - data = m_lx388_kr2376->data_r(space, 0) & 0x7f; - data |= m_lx388_kr2376->get_output_pin(kr2376_device::KR2376_SO) << 7; + data = m_lx387_kr2376->data_r(space, 0) & 0x7f; + data |= m_lx387_kr2376->get_output_pin(kr2376_device::KR2376_SO) << 7; return data; }