From 2b6df7e7d7c4ebf09ac04708a411281927a51633 Mon Sep 17 00:00:00 2001 From: arbee Date: Wed, 4 Jan 2023 19:20:06 -0500 Subject: apple2gs: remove mouse button hack, the Event Manager was being tripped up by a now-fixed macadb issue. [R. Belmont, Kelvin Sherlock] --- src/mame/apple/apple2gs.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/mame/apple/apple2gs.cpp b/src/mame/apple/apple2gs.cpp index 041a3bb4a82..ded87dcf403 100644 --- a/src/mame/apple/apple2gs.cpp +++ b/src/mame/apple/apple2gs.cpp @@ -447,7 +447,6 @@ private: // Key GLU variables u8 m_glu_regs[12]{}, m_glu_bus = 0; bool m_glu_mcu_read_kgs = false, m_glu_816_read_dstat = false, m_glu_mouse_read_stat = false; - u16 m_glu_mouse_first_read; int m_glu_kbd_y = 0; u8 *m_ram_ptr = nullptr; @@ -689,7 +688,6 @@ void apple2gs_state::machine_start() std::fill(std::begin(m_megaii_ram), std::end(m_megaii_ram), 0); std::fill(std::begin(m_glu_regs), std::end(m_glu_regs), 0); - m_glu_mouse_first_read = 0; // setup speaker toggle volumes. this should be done mathematically probably, // but these ad-hoc values aren't too bad. @@ -797,13 +795,11 @@ void apple2gs_state::machine_start() save_item(NAME(m_accel_temp_slowdown)); save_item(NAME(m_accel_speed)); save_item(NAME(m_motoroff_time)); - save_item(NAME(m_glu_mouse_first_read)); } void apple2gs_state::machine_reset() { m_adb_p2_last = m_adb_p3_last = 0; - m_glu_mouse_first_read = 3; m_adb_reset_freeze = 0; m_romswitch = false; m_video->page2_w(false); @@ -3543,21 +3539,6 @@ u8 apple2gs_state::keyglu_816_read(u8 offset) keyglu_regen_irqs(); return m_glu_regs[GLU_MOUSEX]; } - // HACK: the MCU doesn't properly populate the mouse registers until they're read once, - // but the Event Manager assumes the first read is valid and thinks the mouse button is down. - // TODO: how does this work on hardware? - if (m_glu_mouse_first_read > 0) - { - m_glu_mouse_first_read--; - if (m_glu_mouse_first_read & 1) - { - return 0x80 | m_glu_regs[GLU_MOUSEY]; - } - else - { - return m_glu_regs[GLU_MOUSEY] & 0x7f; - } - } return m_glu_regs[GLU_MOUSEY]; case GLU_SYSSTAT: -- cgit v1.2.3