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

Applied a typo-fixing mainline PCem commit to 808x.c;

Browse Source 
Temporarily reverted serial port and serial mouse code back to the old one until the new code is fixed;
Fixed nvr_path handling - the NVR path no longer gets messed up at hard reset.
This commit is contained in:
OBattler
2017-05-06 22:27:23 +02:00
parent f6612fb33b
commit 9f99dbcfae
11 changed files with 295 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mouse_serial.c
View File

@@ -85,13 +85,9 @@ sermouse_init(void)
memset(ms, 0x00, sizeof(mouse_serial_t));
/* Attach a serial port to the mouse. */
#if 1
ms->serial = serial_attach(0, sermouse_rcr, ms);
#else
ms->serial = &serial1;
serial1.rcr_callback = sermouse_rcr;
serial1.rcr_callback_p = ms;
#endif
ms->serial = &serial1;
serial1.rcr_callback = sermouse_rcr;
serial1.rcr_callback_p = ms;
timer_add(sermouse_timer, &ms->delay, &ms->delay, ms);
@@ -105,11 +101,7 @@ sermouse_close(void *priv)
mouse_serial_t *ms = (mouse_serial_t *)priv;
/* Detach serial port from the mouse. */
#if 1
serial_attach(0, NULL, NULL);
#else
serial1.rcr_callback = NULL;
#endif
free(ms);
}