From 21235eeac27047a5c5cd811d2668c049f048336a Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 1 Nov 2018 10:49:19 +0100 Subject: [PATCH] Fixed some EuroPC bugs (one had to do with the NVR), the EuroPC now works again. --- src/machine/m_europc.c | 4 +--- src/nvr.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/machine/m_europc.c b/src/machine/m_europc.c index dceb52195..8977f4ff8 100644 --- a/src/machine/m_europc.c +++ b/src/machine/m_europc.c @@ -68,7 +68,7 @@ * * WARNING THIS IS A WORK-IN-PROGRESS MODULE. USE AT OWN RISK. * - * Version: @(#)europc.c 1.0.8 2018/10/22 + * Version: @(#)europc.c 1.0.9 2018/11/01 * * Author: Fred N. van Kempen, * @@ -739,8 +739,6 @@ machine_europc_init(const machine_t *model) memset(&europc, 0x00, sizeof(europc_t)); europc.jim = 0x0250; - mem_add_bios(); - /* This is machine specific. */ europc.nvr.size = model->nvrmask + 1; europc.nvr.irq = -1; diff --git a/src/nvr.c b/src/nvr.c index e71faa60a..8a70300b6 100644 --- a/src/nvr.c +++ b/src/nvr.c @@ -8,7 +8,7 @@ * * Implement a generic NVRAM/CMOS/RTC device. * - * Version: @(#)nvr.c 1.0.15 2018/10/17 + * Version: @(#)nvr.c 1.0.16 2018/11/01 * * Authors: Fred N. van Kempen, , * David Hrdlička, @@ -322,7 +322,7 @@ nvr_period_recalc(void) /* Make sure we have been initialized. */ if (saved_nvr == NULL) return; - if (saved_nvr->size != 0) + if ((saved_nvr->size != 0) && saved_nvr->recalc) saved_nvr->recalc(saved_nvr); }