From f1ee3cddbac238ab514d0f49f4eb7dadc47ef60b Mon Sep 17 00:00:00 2001 From: SarahW Date: Tue, 9 Jan 2018 18:39:22 +0000 Subject: [PATCH] Fixed Cyrix I/O registers broken by commit 994. --- src/model.c | 1 - src/pc.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/model.c b/src/model.c index e76a34c..e53ee9e 100644 --- a/src/model.c +++ b/src/model.c @@ -542,7 +542,6 @@ void model_init() pclog("Initting as %s\n", model_getname()); AMSTRAD = AT = PCI = TANDY = 0; ide_set_bus_master(NULL, NULL, NULL); - io_init(); models[model].init(); if (models[model].device) diff --git a/src/pc.c b/src/pc.c index b922965..f28da95 100644 --- a/src/pc.c +++ b/src/pc.c @@ -22,6 +22,7 @@ #include "gameport.h" #include "sound_gus.h" #include "ide.h" +#include "io.h" #include "keyboard.h" #include "keyboard_at.h" #include "lpt.h" @@ -289,6 +290,7 @@ void initpc(int argc, char *argv[]) timer_reset(); sound_reset(); + io_init(); fdc_init(); disc_init(); fdi_init(); @@ -383,6 +385,7 @@ void resetpchard() timer_reset(); sound_reset(); + io_init(); cpu_set(); mem_resize(); fdc_init();