From 80c49f96e6d8bd8323fd639b6ba2aee821070409 Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 11 Dec 2019 20:08:15 -0500 Subject: mikrosha.cpp: Import variable from parent state and fix probable typo (nw) --- src/mame/drivers/mikrosha.cpp | 10 +++++++++- src/mame/includes/radio86.h | 2 -- src/mame/machine/radio86.cpp | 5 ----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp index f82dc2910bb..2b23559bab1 100644 --- a/src/mame/drivers/mikrosha.cpp +++ b/src/mame/drivers/mikrosha.cpp @@ -33,12 +33,15 @@ public: void mikrosha(machine_config &config); private: + void mikrosha_8255_font_page_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(mikrosha_pit_out2); I8275_DRAW_CHARACTER_MEMBER(display_pixels); virtual void machine_reset() override; void mikrosha_io(address_map &map); void mikrosha_mem(address_map &map); + + uint8_t m_mikrosha_font_page; }; void mikrosha_state::machine_reset() @@ -161,6 +164,11 @@ static INPUT_PORTS_START( mikrosha ) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) INPUT_PORTS_END +void mikrosha_state::mikrosha_8255_font_page_w(uint8_t data) +{ + m_mikrosha_font_page = (data >> 7) & 1; +} + WRITE_LINE_MEMBER(mikrosha_state::mikrosha_pit_out2) { } @@ -216,7 +224,7 @@ void mikrosha_state::mikrosha(machine_config &config) m_ppi8255_1->out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2)); I8255(config, m_ppi8255_2); - m_ppi8255_2->out_pb_callback().set(FUNC(radio86_state::mikrosha_8255_font_page_w)); + m_ppi8255_2->out_pb_callback().set(FUNC(mikrosha_state::mikrosha_8255_font_page_w)); i8275_device &i8275(I8275(config, "i8275", XTAL(16'000'000) / 12)); i8275.set_character_width(6); diff --git a/src/mame/includes/radio86.h b/src/mame/includes/radio86.h index 5fd3afbb899..f239b733e1d 100644 --- a/src/mame/includes/radio86.h +++ b/src/mame/includes/radio86.h @@ -44,7 +44,6 @@ public: { } uint8_t m_tape_value; - uint8_t m_mikrosha_font_page; int m_keyboard_mask; std::unique_ptr m_radio_ram_disk; uint8_t m_romdisk_lsb; @@ -68,7 +67,6 @@ public: uint8_t radio86ram_romdisk_porta_r(); void radio86_romdisk_portb_w(uint8_t data); void radio86_romdisk_portc_w(uint8_t data); - void mikrosha_8255_font_page_w(uint8_t data); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); I8275_DRAW_CHARACTER_MEMBER(display_pixels); diff --git a/src/mame/machine/radio86.cpp b/src/mame/machine/radio86.cpp index fb203b68101..bb04bff254d 100644 --- a/src/mame/machine/radio86.cpp +++ b/src/mame/machine/radio86.cpp @@ -206,11 +206,6 @@ void radio86_state::radio86_romdisk_portc_w(uint8_t data) m_romdisk_msb = data; } -void radio86_state::mikrosha_8255_font_page_w(uint8_t data) -{ - m_mikrosha_font_page = (data > 7) & 1; -} - I8275_DRAW_CHARACTER_MEMBER(radio86_state::display_pixels) { rgb_t const *const palette = m_palette->palette()->entry_list_raw(); -- cgit v1.2.3