From 43aaf7dc74856950b915957b939d754ce5552ed1 Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 19 Jun 2017 18:33:36 +0200 Subject: [PATCH] When selecting an AT-class machine with less than 1 MB memory size granularity, memory size is no longer incorrectly multiplied by 1024, fixes the crashes with those machines; The NEAT, SCAT, and Headland chipsets no longer remap the top 384 kB. --- src/WIN/win_settings.c | 2 +- src/model.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/WIN/win_settings.c b/src/WIN/win_settings.c index bc5d4724f..a297559de 100644 --- a/src/WIN/win_settings.c +++ b/src/WIN/win_settings.c @@ -674,7 +674,7 @@ static BOOL CALLBACK win_settings_machine_proc(HWND hdlg, UINT message, WPARAM w { temp_mem_size = models[temp_model].max_ram; } - if (models[temp_model].flags & MODEL_AT) + if ((models[temp_model].flags & MODEL_AT) && (models[temp_model].ram_granularity < 128)) { temp_mem_size *= 1024; } diff --git a/src/model.c b/src/model.c index 155fa2793..776c99cff 100644 --- a/src/model.c +++ b/src/model.c @@ -534,14 +534,12 @@ void ps2_model_80_init(void) void at_neat_init(void) { at_ide_init(); - mem_remap_top_384k(); neat_init(); } void at_scat_init(void) { at_ide_init(); - mem_remap_top_384k(); scat_init(); } @@ -566,7 +564,6 @@ void at_wd76c10_init(void) void at_headland_init(void) { at_ide_init(); - mem_remap_top_384k(); headland_init(); }