From 21272432e9e19783a92cc74e23f1efa9f3b4a257 Mon Sep 17 00:00:00 2001 From: shattered Date: Mon, 3 Jun 2024 14:29:41 +0300 Subject: bk.cpp: use K1801VM1 cpu core and keyboard controller device (#12409) --- src/mame/ussr/1801vp014.cpp | 16 ++--- src/mame/ussr/1801vp014.h | 2 - src/mame/ussr/bk.cpp | 140 ++++++++------------------------------------ src/mame/ussr/bk.h | 33 ++++++----- src/mame/ussr/bk_m.cpp | 89 +++++----------------------- 5 files changed, 64 insertions(+), 216 deletions(-) diff --git a/src/mame/ussr/1801vp014.cpp b/src/mame/ussr/1801vp014.cpp index 8e8c22b1196..8b1133fda5d 100644 --- a/src/mame/ussr/1801vp014.cpp +++ b/src/mame/ussr/1801vp014.cpp @@ -24,7 +24,7 @@ //************************************************************************** // device type definition -DEFINE_DEVICE_TYPE(K1801VP014, k1801vp014_device, "1801vp1-014", "1801VP1-014") +DEFINE_DEVICE_TYPE(K1801VP014, k1801vp014_device, "1801vp1_014", "1801VP1-014") //************************************************************************** @@ -39,8 +39,8 @@ static INPUT_PORTS_START(ms7008) PORT_START("LINEC") 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_SHIFT_2) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("АР2 / Alt") PORT_CODE(KEYCODE_LALT) PORT_CODE(KEYCODE_RALT) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ЗАГЛ/СТР / Caps Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("АР2 / Alt") PORT_CODE(KEYCODE_LALT) PORT_CODE(KEYCODE_RALT) PORT_CHAR(UCHAR_MAMEKEY(LALT)) + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ЗАГЛ/СТР / Caps Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_TOGGLE PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED) @@ -62,8 +62,8 @@ static INPUT_PORTS_START(ms7008) PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Delete to EOL") PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2)) // alt vec PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("СБР / Clear") PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8)) PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("РУС / Rus") PORT_CODE(KEYCODE_PGUP) - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ЛАТ / Lat") PORT_CODE(KEYCODE_PGDN) + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("РУС / Rus") PORT_CODE(KEYCODE_PGUP) PORT_CHAR(UCHAR_MAMEKEY(PGUP)) + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ЛАТ / Lat") PORT_CODE(KEYCODE_PGDN) PORT_CHAR(UCHAR_MAMEKEY(PGDN)) PORT_START("LINE2") PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) @@ -171,7 +171,6 @@ k1801vp014_device::k1801vp014_device(const machine_config &mconfig, const char * , m_write_virq(*this) , m_write_keydown(*this) , m_write_halt(*this) - , m_write_data(*this) { } @@ -276,11 +275,6 @@ void k1801vp014_device::write(offs_t offset, uint16_t data, uint16_t mem_mask) case 0: m_kbd_state = (m_kbd_state & ~CSR_IE) | (data & CSR_IE); break; - - case 1: - // FIXME accessing this offset should cause bus error on BK0010 - m_write_data(data >> 8); - break; } } diff --git a/src/mame/ussr/1801vp014.h b/src/mame/ussr/1801vp014.h index 80e7c09b525..03727de4245 100644 --- a/src/mame/ussr/1801vp014.h +++ b/src/mame/ussr/1801vp014.h @@ -34,7 +34,6 @@ public: auto virq_wr_callback() { return m_write_virq.bind(); } auto keydown_wr_callback() { return m_write_keydown.bind(); } auto halt_wr_callback() { return m_write_halt.bind(); } - auto data_wr_callback() { return m_write_data.bind(); } uint16_t read(offs_t offset); void write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); @@ -61,7 +60,6 @@ private: devcb_write_line m_write_virq; devcb_write_line m_write_keydown; devcb_write_line m_write_halt; - devcb_write8 m_write_data; uint8_t m_rxrdy; diff --git a/src/mame/ussr/bk.cpp b/src/mame/ussr/bk.cpp index 90edad4f945..4bdedc1c262 100644 --- a/src/mame/ussr/bk.cpp +++ b/src/mame/ussr/bk.cpp @@ -45,11 +45,11 @@ void bk_state::bk0010_mem(address_map &map) map(0x0000, 0x3fff).ram(); map(0x4000, 0x7fff).ram().share("videoram"); map(0x8000, 0xfeff).rom().region("maincpu",0); - map(0xffb0, 0xffb1).rw(FUNC(bk_state::key_state_r), FUNC(bk_state::key_state_w)); - map(0xffb2, 0xffb3).r(FUNC(bk_state::key_code_r)); + map(0xffb0, 0xffb3).r(m_kbd, FUNC(k1801vp014_device::read)); + map(0xffb0, 0xffb1).w(m_kbd, FUNC(k1801vp014_device::write)); map(0xffb4, 0xffb5).rw(FUNC(bk_state::vid_scroll_r), FUNC(bk_state::vid_scroll_w)); map(0xffcc, 0xffcd).noprw(); - map(0xffce, 0xffcf).rw(FUNC(bk_state::key_press_r), FUNC(bk_state::key_press_w)); + map(0xffce, 0xffcf).rw(FUNC(bk_state::sel1_r), FUNC(bk_state::sel1_w)); } void bk_state::bk0010fd_mem(address_map &map) @@ -62,137 +62,47 @@ void bk_state::bk0010fd_mem(address_map &map) map(0xe000, 0xfdff).rom().region("maincpu",0x6000); map(0xfe58, 0xfe59).rw(FUNC(bk_state::floppy_cmd_r), FUNC(bk_state::floppy_cmd_w)); map(0xfe5a, 0xfe5b).rw(FUNC(bk_state::floppy_data_r), FUNC(bk_state::floppy_data_w)); - map(0xffb0, 0xffb1).rw(FUNC(bk_state::key_state_r), FUNC(bk_state::key_state_w)); - map(0xffb2, 0xffb3).r(FUNC(bk_state::key_code_r)); + map(0xffb0, 0xffb3).r(m_kbd, FUNC(k1801vp014_device::read)); + map(0xffb0, 0xffb1).w(m_kbd, FUNC(k1801vp014_device::write)); map(0xffb4, 0xffb5).rw(FUNC(bk_state::vid_scroll_r), FUNC(bk_state::vid_scroll_w)); map(0xffcc, 0xffcd).noprw(); - map(0xffce, 0xffcf).rw(FUNC(bk_state::key_press_r), FUNC(bk_state::key_press_w)); + map(0xffce, 0xffcf).rw(FUNC(bk_state::sel1_r), FUNC(bk_state::sel1_w)); } /* Input ports */ static INPUT_PORTS_START( bk0010 ) - PORT_START("LINE0") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) - - PORT_START("LINE1") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Clear") PORT_CODE(KEYCODE_HOME) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Rus") PORT_CODE(KEYCODE_LALT) - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Lat") PORT_CODE(KEYCODE_RALT) - - PORT_START("LINE2") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Tab left") PORT_CODE(KEYCODE_PGUP) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Tab right") PORT_CODE(KEYCODE_PGDN) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) - - PORT_START("LINE3") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Delete") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP)) - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) - - PORT_START("LINE4") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') - PORT_BIT(0xFE, IP_ACTIVE_HIGH, IPT_UNUSED) - - PORT_START("LINE5") - PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED) - - PORT_START("LINE6") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('\"') - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR(0xA4) - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') - - PORT_START("LINE7") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*') - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+') - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR('<') PORT_CHAR(',') - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('=') PORT_CHAR('-') - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('>') PORT_CHAR('.') - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('?') PORT_CHAR('/') - - PORT_START("LINE8") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("<>") PORT_CODE(KEYCODE_END) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a') - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b') - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c') - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d') - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e') - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHAR('f') - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g') - - PORT_START("LINE9") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('h') - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i') - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j') - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHAR('k') - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l') - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR('m') - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n') - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHAR('o') - - PORT_START("LINE10") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p') - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q') - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r') - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s') - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHAR('t') - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHAR('u') - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR('v') - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHAR('w') - - PORT_START("LINE11") - PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x') - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y') - PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z') - PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{') - PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|') - PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}') - PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("~") PORT_CODE(KEYCODE_TILDE) // this alone gives nothing and gives ` with Shift! - PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("=") PORT_CODE(KEYCODE_EQUALS) // this alone acts like Enter and gives no result with Shift INPUT_PORTS_END +static const z80_daisy_config daisy_chain[] = +{ + { "keyboard" }, + { "qbus" }, + { nullptr } +}; void bk_state::bk0010(machine_config &config) { /* basic machine hardware */ - T11(config, m_maincpu, 3000000); // FIXME: actually K1801VM1 - m_maincpu->set_initial_mode(0x36ff); /* initial mode word has DAL15,14,11,8 pulled low */ + K1801VM1(config, m_maincpu, 3000000); m_maincpu->set_addrmap(AS_PROGRAM, &bk_state::bk0010_mem); - m_maincpu->in_iack().set(FUNC(bk_state::irq_callback)); + m_maincpu->set_daisy_config(daisy_chain); + m_maincpu->out_reset().set(FUNC(bk_state::reset_w)); QBUS(config, m_qbus, 0); m_qbus->set_space(m_maincpu, AS_PROGRAM); m_qbus->birq4().set_inputline(m_maincpu, t11_device::VEC_LINE); QBUS_SLOT(config, "qbus" ":1", qbus_cards, nullptr); + K1801VP014(config, m_kbd, 0); + m_kbd->virq_wr_callback().set_inputline(m_maincpu, t11_device::VEC_LINE); + m_kbd->keydown_wr_callback().set([this] (int state) { + m_sel1 |= SEL1_UPDATED; + if (state) m_sel1 &= ~SEL1_KEYDOWN; else m_sel1 |= SEL1_KEYDOWN; + }); + m_kbd->halt_wr_callback().set([this] (int state) { + m_maincpu->set_input_line(t11_device::HLT_LINE, state); + }); + /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_refresh_hz(50); diff --git a/src/mame/ussr/bk.h b/src/mame/ussr/bk.h index 89ed6851dbc..8628c197167 100644 --- a/src/mame/ussr/bk.h +++ b/src/mame/ussr/bk.h @@ -10,11 +10,22 @@ #pragma once +#include "1801vp014.h" #include "bus/qbus/qbus.h" #include "cpu/t11/t11.h" #include "imagedev/cassette.h" #include "sound/dac.h" +enum sel1_bits : u16 +{ + SEL1_UPDATED = 0004, + SEL1_RX_SER = 0020, + SEL1_RX_CAS = 0040, + SEL1_KEYDOWN = 0100, + SEL1_RDY_SER = 0200, + SEL1_MOTOR = 0200, +}; + class bk_state : public driver_device { public: @@ -24,8 +35,8 @@ public: , m_maincpu(*this, "maincpu") , m_cassette(*this, "cassette") , m_dac(*this, "dac") + , m_kbd(*this, "keyboard") , m_qbus(*this, "qbus") - , m_io_keyboard(*this, "LINE%u", 0U) { } void bk0010(machine_config &config); @@ -33,36 +44,28 @@ public: private: uint16_t m_scroll = 0U; - uint16_t m_kbd_state = 0U; - uint16_t m_key_code = 0U; - uint16_t m_key_pressed = 0U; - uint16_t m_key_irq_vector = 0U; + uint16_t m_sel1 = 0U; uint16_t m_drive = 0U; - emu_timer *m_kbd_timer = nullptr; - uint16_t key_state_r(); - uint16_t key_code_r(); uint16_t vid_scroll_r(); - uint16_t key_press_r(); + uint16_t sel1_r(); uint16_t trap_r(); - void key_state_w(uint16_t data); void vid_scroll_w(uint16_t data); - void key_press_w(uint16_t data); + void sel1_w(uint16_t data); void trap_w(uint16_t data); uint16_t floppy_cmd_r(); void floppy_cmd_w(uint16_t data); uint16_t floppy_data_r(); void floppy_data_w(uint16_t data); + void reset_w(int state); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - TIMER_CALLBACK_MEMBER(keyboard_callback); - uint8_t irq_callback(offs_t offset); required_shared_ptr m_vram; - required_device m_maincpu; + required_device m_maincpu; required_device m_cassette; required_device m_dac; + required_device m_kbd; required_device m_qbus; - required_ioport_array<12> m_io_keyboard; void bk0010_mem(address_map &map); void bk0010fd_mem(address_map &map); }; diff --git a/src/mame/ussr/bk_m.cpp b/src/mame/ussr/bk_m.cpp index f20f588bc2e..77f4d68cb1f 100644 --- a/src/mame/ussr/bk_m.cpp +++ b/src/mame/ussr/bk_m.cpp @@ -13,93 +13,40 @@ #include "bk.h" -TIMER_CALLBACK_MEMBER(bk_state::keyboard_callback) -{ - uint8_t code, i, j; - - for(i = 1; i < 12; i++) - { - code = m_io_keyboard[i]->read(); - if (code != 0) - { - for(j = 0; j < 8; j++) - { - if (code == (1 << j)) - { - m_key_code = j + i*8; - break; - } - } - if (BIT(m_io_keyboard[0]->read(), 2)) - { - if (i==6 || i==7) - m_key_code -= 16; - else - if (i>=8 && i<=11) - m_key_code += 32; - } - m_key_pressed = 0x40; - - if (!BIT(m_io_keyboard[0]->read(), 1)) - m_key_irq_vector = 0x30; - else - m_key_irq_vector = 0xBC; - - m_maincpu->set_input_line(0, ASSERT_LINE); - break; - } - } -} - - void bk_state::machine_start() { save_item(NAME(m_scroll)); - save_item(NAME(m_kbd_state)); - save_item(NAME(m_key_code)); - save_item(NAME(m_key_pressed)); - save_item(NAME(m_key_irq_vector)); + save_item(NAME(m_sel1)); save_item(NAME(m_drive)); - - m_maincpu->set_input_line(t11_device::VEC_LINE, ASSERT_LINE); - - m_kbd_timer = timer_alloc(FUNC(bk_state::keyboard_callback), this); - m_kbd_timer->adjust(attotime::from_hz(2400), 0, attotime::from_hz(2400)); -} - -uint8_t bk_state::irq_callback(offs_t offset) -{ - m_maincpu->set_input_line(0, CLEAR_LINE); - return m_key_irq_vector; } void bk_state::machine_reset() { - m_kbd_state = 0; + m_sel1 = SEL1_KEYDOWN | SEL1_MOTOR; m_scroll = 01330; } -uint16_t bk_state::key_state_r() +void bk_state::reset_w(int state) { - return m_kbd_state; -} -uint16_t bk_state::key_code_r() -{ - m_kbd_state &= ~0x80; // mark reading done - m_key_pressed = 0; - return m_key_code; + if (state == ASSERT_LINE) + { + m_kbd->reset(); + m_qbus->init_w(); + } } + uint16_t bk_state::vid_scroll_r() { return m_scroll; } -uint16_t bk_state::key_press_r() +uint16_t bk_state::sel1_r() { double level = m_cassette->input(); - uint16_t cas = (level < 0) ? 0 : 0x20; + uint16_t data = 0100000 | m_sel1 | ((level < 0) ? 0 : SEL1_RX_CAS); + m_sel1 &= ~SEL1_UPDATED; - return 0x8080 | m_key_pressed | cas; + return data; } uint16_t bk_state::trap_r() @@ -109,18 +56,14 @@ uint16_t bk_state::trap_r() return ~0; } -void bk_state::key_state_w(uint16_t data) -{ - m_kbd_state = (m_kbd_state & ~0x40) | (data & 0x40); -} - void bk_state::vid_scroll_w(uint16_t data) { - m_scroll = data; + m_scroll = data & 01377; } -void bk_state::key_press_w(uint16_t data) +void bk_state::sel1_w(uint16_t data) { + m_sel1 |= SEL1_UPDATED; m_dac->write(BIT(data, 6)); m_cassette->output(BIT(data, 6) ? 1.0 : -1.0); m_cassette->change_state((BIT(data, 7)) ? CASSETTE_MOTOR_DISABLED : CASSETTE_MOTOR_ENABLED, CASSETTE_MASK_MOTOR); -- cgit v1.2.3