From a64970812494bb2faab14325ff698f9c542435cc Mon Sep 17 00:00:00 2001 From: TC1995 Date: Sat, 8 Oct 2016 22:26:22 +0200 Subject: [PATCH] (nw) --- src/model.c | 2 ++ src/ps1.c | 4 ++-- src/vid_ati28800.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/model.c b/src/model.c index 03fed8772..ba3065bc1 100644 --- a/src/model.c +++ b/src/model.c @@ -276,6 +276,7 @@ void ams_init() mem_add_bios(); amstrad_init(); keyboard_amstrad_init(); + mouse_serial_init(); nvr_init(); xtide_init(); nmi_init(); @@ -300,6 +301,7 @@ void olim24_init() common_init(); mem_add_bios(); keyboard_olim24_init(); + mouse_serial_init(); nvr_init(); olivetti_m24_init(); xtide_init(); diff --git a/src/ps1.c b/src/ps1.c index 033c1bb2e..081527a21 100644 --- a/src/ps1.c +++ b/src/ps1.c @@ -130,7 +130,7 @@ void ps1mb_init() io_sethandler(0x0324, 0x0001, ps1_read, NULL, NULL, ps1_write, NULL, NULL, NULL); rom_init(&ps1_high_rom, - "roms/ibmps1es/f80000.bin", + "roms/ibmps1es/f80000_shell.bin", 0xf80000, 0x80000, 0x7ffff, @@ -279,7 +279,7 @@ void ps1mb_m2121_init() io_sethandler(0x0190, 0x0001, ps1_m2121_read, NULL, NULL, ps1_m2121_write, NULL, NULL, NULL); rom_init(&ps1_high_rom, - "roms/ibmps1_2121/fc0000.bin", + "roms/ibmps1_2121/fc0000_shell.bin", 0xfc0000, 0x40000, 0x3ffff, diff --git a/src/vid_ati28800.c b/src/vid_ati28800.c index 85ef676d6..0db9a6b09 100644 --- a/src/vid_ati28800.c +++ b/src/vid_ati28800.c @@ -315,6 +315,8 @@ void ati28800_recalctimings(svga_t *svga) #ifndef RELEASE_BUILD pclog("ati28800_recalctimings\n"); #endif + svga->interlace = (!svga->scrblank && (ati28800->regs[0x30] & 0x20)); + if (!svga->scrblank && (ati28800->regs[0x30] & 0x20)) /*Extended 256 colour modes*/ { #ifndef RELEASE_BUILD