claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the Amstrad PC1640 (ROM path) and Amstrad mouse initialization.

Browse Source
This commit is contained in:
waltje
2018-03-20 23:41:52 -05:00
parent 73a0ba8e39
commit 1b19d226dd
1 changed files with 1310 additions and 1308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/machine/m_amstrad.c
View File

@@ -32,7 +32,7 @@
* BIOSES: I need to re-do the bios.txt format so we can load non-BIOS * BIOSES: I need to re-do the bios.txt format so we can load non-BIOS
* ROM files for a given machine, such as font roms here.. * ROM files for a given machine, such as font roms here..
* *
* Version: @(#)m_amstrad.c 1.0.5 2018/03/19 * Version: @(#)m_amstrad.c 1.0.6 2018/03/20
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -699,7 +699,7 @@ vid_init_1640(amstrad_t *ams)
vid = (amsvid_t *)malloc(sizeof(amsvid_t)); vid = (amsvid_t *)malloc(sizeof(amsvid_t));
memset(vid, 0x00, sizeof(amsvid_t)); memset(vid, 0x00, sizeof(amsvid_t));
rom_init(&vid->bios_rom, L"roms/machines/pc1640/40100", rom_init(&vid->bios_rom, L"roms/machines/amstrad/pc1640/40100",
0xc0000, 0x8000, 0x7fff, 0, 0); 0xc0000, 0x8000, 0x7fff, 0, 0);
ega_init(&vid->ega, 9, 0); ega_init(&vid->ega, 9, 0);
@@ -1306,8 +1306,10 @@ machine_amstrad_init(const machine_t *model)
keyboard_send = kbd_adddata_ex; keyboard_send = kbd_adddata_ex;
keyboard_scan = 1; keyboard_scan = 1;
/* Tell mouse driver about our internal mouse. */ /* Tell mouse driver about our internal mouse. */
mouse_reset(); if (mouse_type == MOUSE_TYPE_INTERNAL) {
mouse_reset();
mouse_set_poll(ms_poll, ams);
} }
if (joystick_type != JOYSTICK_TYPE_NONE) if (joystick_type != JOYSTICK_TYPE_NONE)