diff options
author | Patrick Mackinlay <pmackinlay@hotmail.com> | 2018-05-26 00:40:59 +0700 |
---|---|---|
committer | R. Belmont <rb6502@users.noreply.github.com> | 2018-05-25 13:40:59 -0400 |
commit | 12f3b9f8a763aead74791a597f3ed4a15a25e145 (patch) | |
tree | a3206c9dd1598b2817c6a035d217104263e6f17d /src/mame | |
parent | 106e27478414a80e0959be52e55b23742855646c (diff) |
interpro: lle keyboard working (#3608)
* interpro: lle keyboard working
* lle keyboard working, mapping incomplete
* slow down cpu, fixes keyboard boot and graphic glitching
* remove unnecessary reset suspend/timer
* 6700/6800 eprom confirmed to match 2700/2800
* fix line clipping crash and remove noisy logging
* interpro: don't use UCHAR_MAMEKEY (nw)
Diffstat (limited to 'src/mame')
-rw-r--r-- | src/mame/drivers/interpro.cpp | 14 | ||||
-rw-r--r-- | src/mame/includes/interpro.h | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp index 56c12ef53f2..d31b8d2c048 100644 --- a/src/mame/drivers/interpro.cpp +++ b/src/mame/drivers/interpro.cpp @@ -254,8 +254,6 @@ void interpro_state::machine_start() save_item(NAME(m_sreg_ctrl2)); save_item(NAME(m_sreg_ctrl3)); - - m_reset_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(interpro_state::reset_timer), this)); } void interpro_state::machine_reset() @@ -264,10 +262,6 @@ void interpro_state::machine_reset() m_sreg_error = 0; m_sreg_status = 0x400; m_sreg_ctrl1 = CTRL1_FLOPLOW; - - // suspend the main cpu long enough for the keyboard to boot - m_maincpu->suspend(SUSPEND_REASON_RESET, false); - m_reset_timer->adjust(attotime::from_msec(750)); } void interpro_state::init_common() @@ -609,7 +603,7 @@ MACHINE_CONFIG_START(interpro_state::interpro_scc2) MCFG_Z80SCC_OUT_INT_CB(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir11_w)) MCFG_Z80SCC_OUT_WREQB_CB(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_serial0)) - MCFG_INTERPRO_KEYBOARD_PORT_ADD(INTERPRO_KEYBOARD_PORT_TAG, interpro_keyboard_devices, "hle_en_us") + MCFG_INTERPRO_KEYBOARD_PORT_ADD(INTERPRO_KEYBOARD_PORT_TAG, interpro_keyboard_devices, "lle_en_us") MCFG_INTERPRO_KEYBOARD_RXD_HANDLER(WRITELINE(INTERPRO_SCC2_TAG, z80scc_device, rxa_w)) MCFG_DEVICE_ADD(INTERPRO_SERIAL_PORT0_TAG, RS232_PORT, default_rs232_devices, nullptr) @@ -1182,10 +1176,9 @@ ROM_START(ip6700) ROM_REGION(0x80, INTERPRO_IDPROM_TAG, 0) ROM_LOAD32_BYTE("msmt127b.bin", 0x0, 0x20, CRC(cc112f65) SHA1(8533a31b4733fd91bb87effcd276fc93f2858629)) - // FIXME: use 2800 eprom until we have a 6700 dump ROM_REGION(0x20000, INTERPRO_EPROM_TAG, 0) ROM_SYSTEM_BIOS(0, "ip6700", "InterPro 6700 EPROM") - ROMX_LOAD("mprgz530a.u144", 0x00000, 0x20000, BAD_DUMP CRC(467ce7bd) SHA1(53faee40d5df311f53b24c930e434cbf94a5c4aa), ROM_BIOS(1)) + ROMX_LOAD("mprgz530a.u144", 0x00000, 0x20000, CRC(467ce7bd) SHA1(53faee40d5df311f53b24c930e434cbf94a5c4aa), ROM_BIOS(1)) ROM_REGION(0x20000, INTERPRO_FLASH_TAG "_lo", 0) ROM_LOAD_OPTIONAL("y225.u117", 0x00000, 0x20000, CRC(46c0b105) SHA1(7c4a104e4fb3d0e5e8db7c911cdfb3f5c4fb0218)) @@ -1198,10 +1191,9 @@ ROM_START(ip6800) ROM_REGION(0x80, INTERPRO_IDPROM_TAG, 0) ROM_LOAD32_BYTE("msmt127b.bin", 0x0, 0x20, CRC(cc112f65) SHA1(8533a31b4733fd91bb87effcd276fc93f2858629)) - // FIXME: use 2800 eprom until we have a 6800 dump ROM_REGION(0x20000, INTERPRO_EPROM_TAG, 0) ROM_SYSTEM_BIOS(0, "ip6800", "InterPro 6800 EPROM") - ROMX_LOAD("mprgz530a__9406270.u144", 0x00000, 0x20000, BAD_DUMP CRC(467ce7bd) SHA1(53faee40d5df311f53b24c930e434cbf94a5c4aa), ROM_BIOS(1)) + ROMX_LOAD("mprgz530a__9406270.u144", 0x00000, 0x20000, CRC(467ce7bd) SHA1(53faee40d5df311f53b24c930e434cbf94a5c4aa), ROM_BIOS(1)) ROM_REGION(0x20000, INTERPRO_FLASH_TAG "_lo", 0) ROM_LOAD_OPTIONAL("y225.u117", 0x00000, 0x20000, CRC(46c0b105) SHA1(7c4a104e4fb3d0e5e8db7c911cdfb3f5c4fb0218)) diff --git a/src/mame/includes/interpro.h b/src/mame/includes/interpro.h index 9cb22d6b086..0832f3bcc36 100644 --- a/src/mame/includes/interpro.h +++ b/src/mame/includes/interpro.h @@ -171,8 +171,6 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; - TIMER_CALLBACK_MEMBER(reset_timer) { m_maincpu->resume(SUSPEND_REASON_RESET); } - output_finder<> m_led; emu_timer *m_reset_timer; |