diff --git a/src/mame/drivers/dg680.cpp b/src/mame/drivers/dg680.cpp index e583218e32e..8ab2124afaf 100644 --- a/src/mame/drivers/dg680.cpp +++ b/src/mame/drivers/dg680.cpp @@ -59,7 +59,6 @@ ToDo: ****************************************************************************/ #include "emu.h" -#include "bus/rs232/keyboard.h" #include "machine/z80daisy.h" #include "cpu/z80/z80.h" #include "imagedev/cassette.h" @@ -81,7 +80,6 @@ public: , m_cass(*this, "cassette") , m_pio(*this, "pio") , m_ctc(*this, "ctc") - , m_rs232(*this, "keyboard") , m_clock(*this, "cass_clock") , m_s100(*this, "s100") { } @@ -113,9 +111,8 @@ private: required_device m_maincpu; required_device m_cass; - optional_device m_pio; + required_device m_pio; required_device m_ctc; - optional_device m_rs232; required_device m_clock; required_device m_s100; }; diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp index ef2f512e32d..d1d11a017a5 100644 --- a/src/mame/drivers/mkit09.cpp +++ b/src/mame/drivers/mkit09.cpp @@ -2,15 +2,12 @@ // copyright-holders:Robbbert /*************************************************************************** - Multitech Microkit09 +Multitech Microkit09 - 2013-12-08 Mostly working driver. +2013-12-08 Mostly working driver. - The only documentation is in French, so the operation of the system - is a bit of a mystery. ToDo: - - Fix Cassette - Need software to test with Pasting: @@ -26,7 +23,7 @@ Test Paste: - 2015-10-02 Added alternate bios found on a forum. Memory map is different. +2015-10-02 Added alternate bios found on a forum. Memory map is different. Still to fix keyboard and display. No documentation exists. ****************************************************************************/ @@ -49,6 +46,7 @@ public: , m_cass(*this, "cassette") , m_maincpu(*this, "maincpu") , m_digits(*this, "digit%u", 0U) + , m_io_keyboard(*this, "X%u", 0) { } void mkit09a(machine_config &config); @@ -72,6 +70,7 @@ private: required_device m_cass; required_device m_maincpu; output_finder<10> m_digits; + required_ioport_array<4> m_io_keyboard; }; @@ -159,11 +158,7 @@ void mkit09_state::machine_reset() READ8_MEMBER( mkit09_state::pa_r ) { if (m_keydata < 4) - { - char kbdrow[4]; - sprintf(kbdrow,"X%d",m_keydata); - return ioport(kbdrow)->read(); - } + return m_io_keyboard[m_keydata]->read(); return 0xff; } @@ -219,6 +214,7 @@ void mkit09_state::mkit09(machine_config &config) m_pia->irqb_handler().set_inputline("maincpu", M6809_IRQ_LINE); CASSETTE(config, m_cass); + m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); m_cass->add_route(ALL_OUTPUTS, "mono", 0.05); }