80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Moved mouse_reset() to before machine_init(), should fix the initialization of Amstrad and Olivetti M24 internal mice.

Browse Source
This commit is contained in:
OBattler
2018-01-29 00:49:40 +01:00
parent 2e17ef04e3
commit af0482bd04
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pc.c
View File

@@ -8,7 +8,7 @@
* *
* Main emulator module where most things are controlled. * 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, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -791,6 +791,13 @@ pc_reset_hard_init(void)
serial_init(); serial_init();
#endif #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. */ /* Initialize the actual machine and its basic modules. */
machine_init(); machine_init();
@@ -815,13 +822,6 @@ pc_reset_hard_init(void)
shadowbios = 0; shadowbios = 0;
keyboard_at_reset(); 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. */ /* Reset the video card. */
video_reset(gfxcard); video_reset(gfxcard);