claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mouse changes - mice are now regular devices with config options.

Browse Source
This commit is contained in:
waltje
2017-12-10 02:08:37 -05:00
parent 50cf53515c
commit d52846d3be
12 changed files with 142 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/machine/m_amstrad.c
View File

@@ -22,8 +22,8 @@
* PC200: CGA with some NMI stuff. But we don't need that as it's only
* used for TV and LCD displays, and we're emulating a CRT.
*
* TODO: This module is not complete yet:
*
* TODO: This module is not complete yet:
*
* PC1512: The BIOS assumes 512K RAM, because I cannot figure out how to
* read the status of the LK4 jumper on the mainboard, which is
* somehow linked to the bus gate array on the NDMACS line...
@@ -32,7 +32,7 @@
* in alpha mode, but in highres ("ECD350") mode, it displays
* some semi-random junk. Video-memory pointer maybe?
*
* Version: @(#)m_amstrad.c 1.0.4 2017/11/24
* Version: @(#)m_amstrad.c 1.0.5 2017/12/09
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -934,7 +934,7 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
{
amstrad_t *ams = (amstrad_t *)priv;
#ifdef WALTJE
int i = 0;
int i = 0;
#endif
#if ENABLE_KEYBOARD_LOG
@@ -1250,7 +1250,7 @@ machine_amstrad_init(machine_t *model)
case ROM_MEGAPC:
device_add(&paradise_wd90c11_megapc_device);
break;
break;
}
/* Initialize the (custom) keyboard/mouse interface. */
@@ -1262,7 +1262,7 @@ machine_amstrad_init(machine_t *model)
keyboard_send = kbd_adddata;
keyboard_scan = 1;
/* Tell mouse driver about our internal mouse. */
/* Tell mouse driver about our internal mouse. */
mouse_set_poll(ms_poll, ams);
if (joystick_type != 7)

4
src/machine/m_olivetti_m24.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the Olivetti M24.
*
* Version: @(#)m_olivetti_m24.c 1.0.6 2017/11/24
* Version: @(#)m_olivetti_m24.c 1.0.7 2017/12/09
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -832,7 +832,7 @@ machine_olim24_init(machine_t *model)
timer_add(kbd_poll, &keyboard_delay, TIMER_ALWAYS_ENABLED, m24);
/* Tell mouse driver about our internal mouse. */
mouse_setpoll(ms_poll, m24);
mouse_set_poll(ms_poll, m24);
if (joystick_type != 7)
device_add(&gameport_device);