diff options
Diffstat (limited to 'src/devices/machine/i8279.cpp')
-rw-r--r-- | src/devices/machine/i8279.cpp | 225 |
1 files changed, 124 insertions, 101 deletions
diff --git a/src/devices/machine/i8279.cpp b/src/devices/machine/i8279.cpp index 12f2a7cd6dd..16e7c5e64bc 100644 --- a/src/devices/machine/i8279.cpp +++ b/src/devices/machine/i8279.cpp @@ -79,6 +79,9 @@ that uses this feature. //#define VERBOSE 1 #include "logmacro.h" +// MAME updates inputs frame-by-frame, causing lockout to occur too often +#define EMULATE_KEY_LOCKOUT 0 + //************************************************************************** // LIVE DEVICE //************************************************************************** @@ -96,9 +99,9 @@ i8279_device::i8279_device(const machine_config &mconfig, const char *tag, devic m_out_sl_cb(*this), m_out_disp_cb(*this), m_out_bd_cb(*this), - m_in_rl_cb(*this), - m_in_shift_cb(*this), - m_in_ctrl_cb(*this) + m_in_rl_cb(*this, 0xff), + m_in_shift_cb(*this, 1), + m_in_ctrl_cb(*this, 1) { } @@ -108,16 +111,8 @@ i8279_device::i8279_device(const machine_config &mconfig, const char *tag, devic void i8279_device::device_start() { - /* resolve callbacks */ - m_out_irq_cb.resolve(); - m_out_sl_cb.resolve(); - m_out_disp_cb.resolve(); - m_out_bd_cb.resolve(); - m_in_rl_cb.resolve(); - m_in_shift_cb.resolve(); - m_in_ctrl_cb.resolve(); m_scanclock = clock(); - m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(i8279_device::timerproc_callback), this)); + m_timer = timer_alloc(FUNC(i8279_device::timerproc_callback), this); // save state save_item(NAME(m_d_ram)); @@ -132,7 +127,9 @@ void i8279_device::device_start() save_item(NAME(m_autoinc)); save_item(NAME(m_read_flag)); save_item(NAME(m_ctrl_key)); + save_item(NAME(m_se_mode)); save_item(NAME(m_key_down)); + save_item(NAME(m_debounce)); } @@ -154,7 +151,9 @@ void i8279_device::device_reset() m_read_flag = 0; m_scanner = 0; m_ctrl_key = 1; - m_key_down = 0xffff; + m_se_mode = 0; + m_key_down = 0; + m_debounce = 0; // from here is confirmed m_cmd[0] = 8; @@ -198,34 +197,11 @@ void i8279_device::clear_display() // The CF bit (also done by CA) if (m_cmd[6] & 3) { - m_status &= 0xc0; // blow away fifo + m_status &= 0x80; // blow away fifo m_s_ram_ptr = 0; // reset sensor pointer - set_irq(0); // reset irq - } -} - - -void i8279_device::set_irq(bool state) -{ - if ( !m_out_irq_cb.isnull() ) - m_out_irq_cb( state ); -} - - -void i8279_device::new_key(u8 data, bool skey, bool ckey) -{ - u8 i, rl, sl; - for (i = 0; BIT(data, i); i++) {}; - rl = i; - if (BIT(m_cmd[0], 0)) - { - for (i = 0; !BIT(data, i); i++) {}; - sl = i; + m_debounce = 0; // reset debounce logic + m_out_irq_cb(0); // reset irq } - else - sl = m_scanner & 7; - - new_fifo( (ckey << 7) | (skey << 6) | (sl << 3) | rl); } @@ -235,13 +211,19 @@ void i8279_device::new_fifo(u8 data) if (BIT(m_status, 5)) return; + // see if special error + if (BIT(m_status, 6)) + return; + // set overrun flag if full if (BIT(m_status, 3)) { + LOG("FIFO overrun\n"); m_status |= 0x20; return; } + LOG("FIFO[%d] = %02X\n", m_status & 7, data); m_fifo[m_status & 7] = data; // bump fifo size & turn off underrun @@ -252,7 +234,7 @@ void i8279_device::new_fifo(u8 data) m_status = (m_status & 0xe8) + fifo_size + 1; if (!fifo_size) - set_irq(1); // something just went into fifo, so int + m_out_irq_cb(1); // something just went into fifo, so int } @@ -270,17 +252,11 @@ void i8279_device::timer_mainloop() // bit 3 - number of digits to display // bit 4 - left or right entry - u8 scanner_mask = BIT(m_cmd[0], 0) ? 15 : BIT(m_cmd[0], 3) ? 15 : 7; + u8 scanner_mask = BIT(m_cmd[0], 0) ? 3 : BIT(m_cmd[0], 3) ? 15 : 7; bool decoded = BIT(m_cmd[0], 0); u8 kbd_type = (m_cmd[0] & 6) >> 1; - bool shift_key = 1; - bool ctrl_key = 1; bool strobe_pulse = 0; - // hack to prevent infinite loops - if (decoded && m_scanner == 0) - m_scanner = 1; - // keyboard // type 0 = kbd, 2-key lockout // type 1 = kdb, n-key @@ -288,12 +264,8 @@ void i8279_device::timer_mainloop() // type 3 = strobed // Get shift keys - if ( !m_in_shift_cb.isnull() ) - shift_key = m_in_shift_cb(); - - if ( !m_in_ctrl_cb.isnull() ) - ctrl_key = m_in_ctrl_cb(); - + bool shift_key = m_in_shift_cb(); + bool ctrl_key = m_in_ctrl_cb(); if (ctrl_key && !m_ctrl_key) strobe_pulse = 1; // low-to-high is a strobe @@ -301,73 +273,118 @@ void i8279_device::timer_mainloop() // Read a row of keys - if ( !m_in_rl_cb.isnull() ) + if ( !m_in_rl_cb.isunset() ) { - u8 rl = m_in_rl_cb(0); + u8 rl = m_in_rl_cb(0) ^ 0xff; // inverted + u8 addr = m_scanner & 7; + assert(addr < std::size(m_s_ram)); // see if key still down from last time - u16 key_down = ((m_scanner & scanner_mask) << 8) | rl; - if (key_down == m_key_down) - rl = 0xff; - else - if ((rl == 0xff) && ((m_scanner & scanner_mask) == m_key_down >> 8)) - m_key_down = 0xffff; + u8 keys_down = rl & ~m_s_ram[addr]; // now process new key - if (rl < 0xff || kbd_type == 2) + switch (kbd_type) { - m_key_down = key_down; - switch (kbd_type) + case 0: +#if EMULATE_KEY_LOCKOUT + // 2-key lockout + if (keys_down != 0) { - case 0: - case 1: - new_key(rl, shift_key, ctrl_key); - break; - case 2: + for (int i = 0; i < 8; i++) + { + if (BIT(keys_down, i)) { - u8 addr = m_scanner &7; - - if (decoded) - for (addr=0; !BIT(m_scanner, addr); addr++) {}; - - rl ^= 0xff; // inverted - assert(addr < ARRAY_LENGTH(m_s_ram)); - if (m_s_ram[addr] != rl) + if (m_debounce == 0 || m_key_down != (addr << 3 | i)) + { + m_key_down = addr << 3 | i; + m_debounce = 1; + } + else if (m_debounce++ > 1) { - m_s_ram[addr] = rl; + new_fifo((ctrl_key << 7) | (shift_key << 6) | m_key_down); + m_s_ram[addr] |= 1 << i; + m_debounce = 0; + } + } + } + } + if ((m_key_down >> 3) == addr && !BIT(rl, m_key_down & 7)) + m_debounce = 0; + m_s_ram[addr] &= rl; + break; +#endif // EMULATE_KEY_LOCKOUT - // IRQ line goes high if a row change value - set_irq(1); + case 1: + // N-key rollover + if (keys_down != 0) + { + for (int i = 0; i < 8; i++) + { + if (BIT(keys_down, i)) + { + if (m_debounce == 0) + { + m_key_down = addr << 3 | i; + m_debounce = 1; + } + else if (m_key_down != (addr << 3 | i)) + { +#if EMULATE_KEY_LOCKOUT + if (m_se_mode && !BIT(m_status, 6)) + { + m_status |= 0x40; + m_out_irq_cb(1); + } +#endif // EMULATE_KEY_LOCKOUT + } + else if (m_debounce++ > 1) + { + new_fifo((ctrl_key << 7) | (shift_key << 6) | m_key_down); + m_s_ram[addr] |= 1 << i; + m_debounce = 0; } } - break; - case 3: - if (strobe_pulse) new_fifo(rl); - break; + } } + if ((m_key_down >> 3) == addr && !BIT(rl, m_key_down & 7)) + m_debounce = 0; + m_s_ram[addr] &= rl; + break; + + case 2: + if (keys_down != 0 && !m_se_mode) + m_status |= 0x40; + + if (m_s_ram[addr] != rl) + { + m_s_ram[addr] = rl; + + // IRQ line goes high if a row changes value + m_out_irq_cb(1); + } + break; + + case 3: + if (strobe_pulse) + new_fifo(rl); + m_s_ram[addr] = rl; + break; } } // Increment scanline + m_scanner = (m_scanner + 1) & (decoded ? 3 : 15); + + // Active low strobed output in decoded mode if (decoded) - { - m_scanner<<= 1; - if ((m_scanner & 15)==0) - m_scanner = 1; - } + m_out_sl_cb(offs_t(0), (1 << m_scanner) ^ 15); else - m_scanner++; - - m_scanner &= 15; // 4-bit port - - if ( !m_out_sl_cb.isnull() ) - m_out_sl_cb((offs_t)0, m_scanner); + m_out_sl_cb(offs_t(0), m_scanner); // output a digit - if ( !m_out_disp_cb.isnull() ) - m_out_disp_cb((offs_t)0, m_d_ram[m_scanner & scanner_mask] ); + m_out_disp_cb(offs_t(0), m_d_ram[m_scanner & scanner_mask]); } @@ -402,7 +419,7 @@ u8 i8279_device::data_r() if (sensor_mode) { // read sensor ram - assert(m_s_ram_ptr < ARRAY_LENGTH(m_s_ram)); + assert(m_s_ram_ptr < std::size(m_s_ram)); data = m_s_ram[m_s_ram_ptr]; if (!machine().side_effects_disabled()) { @@ -412,7 +429,7 @@ u8 i8279_device::data_r() } else { - set_irq(0); + m_out_irq_cb(0); } } } @@ -434,7 +451,7 @@ u8 i8279_device::data_r() m_fifo[i-1] = m_fifo[i]; fifo_size--; if (!fifo_size) - set_irq(0); + m_out_irq_cb(0); } break; case 0x28: // overrun @@ -445,8 +462,9 @@ u8 i8279_device::data_r() case 0x10: // underrun if (!fifo_size) break; + [[fallthrough]]; default: - printf("Invalid status: %X\n", m_status); + logerror("Invalid status: %X\n", m_status); } } m_status = (m_status & 0xd0) | fifo_size; // turn off overrun & full @@ -507,6 +525,11 @@ void i8279_device::cmd_w(u8 data) LOG("I8279 clear cmd %x\n", data); clear_display(); break; + case 7: + m_out_irq_cb(0); + m_se_mode = BIT(data, 4); + m_status &= 0xbf; + break; } } |