diff options
Diffstat (limited to 'src/mame/drivers/mekd2.cpp')
-rw-r--r-- | src/mame/drivers/mekd2.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp index fe4b6825491..b0f06299280 100644 --- a/src/mame/drivers/mekd2.cpp +++ b/src/mame/drivers/mekd2.cpp @@ -107,16 +107,16 @@ public: void mekd2(machine_config &config); private: - DECLARE_READ_LINE_MEMBER(mekd2_key40_r); - uint8_t mekd2_key_r(); - DECLARE_WRITE_LINE_MEMBER(mekd2_nmi_w); - void mekd2_digit_w(uint8_t data); - void mekd2_segment_w(uint8_t data); + DECLARE_READ_LINE_MEMBER(key40_r); + uint8_t key_r(); + DECLARE_WRITE_LINE_MEMBER(nmi_w); + void digit_w(uint8_t data); + void segment_w(uint8_t data); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); TIMER_DEVICE_CALLBACK_MEMBER(kansas_w); TIMER_DEVICE_CALLBACK_MEMBER(kansas_r); - void mekd2_mem(address_map &map); + void mem_map(address_map &map); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; uint8_t m_cass_data[4]; @@ -142,14 +142,14 @@ private: ************************************************************/ -void mekd2_state::mekd2_mem(address_map &map) +void mekd2_state::mem_map(address_map &map) { map(0x0000, 0x00ff).ram(); // user ram map(0x8004, 0x8007).rw(m_pia_u, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0x8008, 0x8009).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write)); map(0x8020, 0x8023).rw(m_pia_s, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); map(0xa000, 0xa07f).ram(); // system ram - map(0xe000, 0xe3ff).rom().mirror(0x1c00); /* JBUG ROM */ + map(0xe000, 0xe3ff).rom().mirror(0x1c00).region("maincpu",0); /* JBUG ROM */ } /*********************************************************** @@ -216,7 +216,7 @@ void mekd2_state::device_timer(emu_timer &timer, device_timer_id id, int param, } -WRITE_LINE_MEMBER( mekd2_state::mekd2_nmi_w ) +WRITE_LINE_MEMBER( mekd2_state::nmi_w ) { if (state) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); @@ -232,12 +232,12 @@ WRITE_LINE_MEMBER( mekd2_state::mekd2_nmi_w ) ************************************************************/ -READ_LINE_MEMBER( mekd2_state::mekd2_key40_r ) +READ_LINE_MEMBER( mekd2_state::key40_r ) { return BIT(m_keydata, 6); } -uint8_t mekd2_state::mekd2_key_r() +uint8_t mekd2_state::key_r() { char kbdrow[4]; uint8_t i; @@ -275,12 +275,12 @@ uint8_t mekd2_state::mekd2_key_r() ************************************************************/ -void mekd2_state::mekd2_segment_w(uint8_t data) +void mekd2_state::segment_w(uint8_t data) { m_segment = data & 0x7f; } -void mekd2_state::mekd2_digit_w(uint8_t data) +void mekd2_state::digit_w(uint8_t data) { if (data < 0x3f) { @@ -371,7 +371,7 @@ void mekd2_state::mekd2(machine_config &config) { /* basic machine hardware */ M6800(config, m_maincpu, XTAL_MEKD2 / 2); /* 614.4 kHz */ - m_maincpu->set_addrmap(AS_PROGRAM, &mekd2_state::mekd2_mem); + m_maincpu->set_addrmap(AS_PROGRAM, &mekd2_state::mem_map); config.set_default_layout(layout_mekd2); @@ -383,11 +383,11 @@ void mekd2_state::mekd2(machine_config &config) /* Devices */ PIA6821(config, m_pia_s, 0); - m_pia_s->readpa_handler().set(FUNC(mekd2_state::mekd2_key_r)); - m_pia_s->readcb1_handler().set(FUNC(mekd2_state::mekd2_key40_r)); - m_pia_s->writepa_handler().set(FUNC(mekd2_state::mekd2_segment_w)); - m_pia_s->writepb_handler().set(FUNC(mekd2_state::mekd2_digit_w)); - m_pia_s->ca2_handler().set(FUNC(mekd2_state::mekd2_nmi_w)); + m_pia_s->readpa_handler().set(FUNC(mekd2_state::key_r)); + m_pia_s->readcb1_handler().set(FUNC(mekd2_state::key40_r)); + m_pia_s->writepa_handler().set(FUNC(mekd2_state::segment_w)); + m_pia_s->writepb_handler().set(FUNC(mekd2_state::digit_w)); + m_pia_s->ca2_handler().set(FUNC(mekd2_state::nmi_w)); m_pia_s->irqa_handler().set_inputline("maincpu", INPUT_LINE_NMI); m_pia_s->irqb_handler().set_inputline("maincpu", INPUT_LINE_NMI); @@ -417,8 +417,8 @@ void mekd2_state::mekd2(machine_config &config) ************************************************************/ ROM_START(mekd2) - ROM_REGION(0x10000,"maincpu",0) - ROM_LOAD("jbug.rom", 0xe000, 0x0400, CRC(5ed08792) SHA1(b06e74652a4c4e67c4a12ddc191ffb8c07f3332e) ) + ROM_REGION(0x0400,"maincpu",0) + ROM_LOAD("jbug.rom", 0x0000, 0x0400, CRC(5ed08792) SHA1(b06e74652a4c4e67c4a12ddc191ffb8c07f3332e) ) ROM_END /*************************************************************************** @@ -428,4 +428,4 @@ ROM_END ***************************************************************************/ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 1977, mekd2, 0, 0, mekd2, mekd2, mekd2_state, empty_init, "Motorola", "MEK6800D2" , 0 ) +COMP( 1977, mekd2, 0, 0, mekd2, mekd2, mekd2_state, empty_init, "Motorola", "MEK6800D2" , MACHINE_SUPPORTS_SAVE ) |