Update stack_hop_back() to jump to 16bit mode if called in 32bit mode.

Also, update callers to rely on this feature.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/mouse.c b/src/mouse.c
index 466f55a2..6d1f5b77 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -274,13 +274,17 @@ handle_15c2(struct bregs *regs)
     }
 }
 
-static void
+void VISIBLE16
 invoke_mouse_handler(void)
 {
+    if (!CONFIG_MOUSE)
+        return;
     if (need_hop_back()) {
-        stack_hop_back(0, 0, invoke_mouse_handler);
+        extern void _cfunc16_invoke_mouse_handler(void);
+        stack_hop_back(0, 0, _cfunc16_invoke_mouse_handler);
         return;
     }
+    ASSERT16();
     u16 ebda_seg = get_ebda_seg();
     u16 status = GET_EBDA(ebda_seg, mouse_data[0]);
     u16 X      = GET_EBDA(ebda_seg, mouse_data[1]);