Moved mouse_reset() to before machine_init(), should fix the initialization of Amstrad and Olivetti M24 internal mice.
This commit is contained in:
16
src/pc.c
16
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, <http://pcem-emulator.co.uk/>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user