From af0482bd040d07a0a6d65400684a774524c9d5fb Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 29 Jan 2018 00:49:40 +0100 Subject: [PATCH] Moved mouse_reset() to before machine_init(), should fix the initialization of Amstrad and Olivetti M24 internal mice. --- src/pc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pc.c b/src/pc.c index 411a87c25..f7d6c0374 100644 --- a/src/pc.c +++ b/src/pc.c @@ -8,7 +8,7 @@ * * Main emulator module where most things are controlled. * - * Version: @(#)pc.c 1.0.55 2018/01/28 + * Version: @(#)pc.c 1.0.56 2018/01/29 * * Authors: Sarah Walker, * Miran Grca, @@ -791,6 +791,13 @@ pc_reset_hard_init(void) serial_init(); #endif + /* + * This has to be after the serial initialization so that + * serial_init() doesn't break the serial mouse by resetting + * the RCR callback to NULL. + */ + mouse_reset(); + /* Initialize the actual machine and its basic modules. */ machine_init(); @@ -815,13 +822,6 @@ pc_reset_hard_init(void) shadowbios = 0; keyboard_at_reset(); - /* - * This has to be after the serial initialization so that - * serial_init() doesn't break the serial mouse by resetting - * the RCR callback to NULL. - */ - mouse_reset(); - /* Reset the video card. */ video_reset(gfxcard);