From c6ee6f48de94866786264c41c1ffea571ff6839f Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 21 Oct 2019 03:24:36 +0200 Subject: [PATCH] Removed an unused table from the XT MFM controller code; 808x prefetch queue is now always cleared on soft reset (as it should be due the changing CS:IP). --- src/cpu/808x.c | 9 +++++---- src/disk/hdc_st506_xt.c | 22 ++-------------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/src/cpu/808x.c b/src/cpu/808x.c index c83718884..9d4e318f6 100644 --- a/src/cpu/808x.c +++ b/src/cpu/808x.c @@ -9,7 +9,7 @@ * 808x CPU emulation, mostly ported from reenigne's XTCE, which * is cycle-accurate. * - * Version: @(#)808x.c 1.0.10 2019/10/20 + * Version: @(#)808x.c 1.0.11 2019/10/21 * * Authors: Andrew Jenner, * Miran Grca, @@ -943,7 +943,6 @@ reset_common(int hard) resetreadlookup(); makemod1table(); resetmcr(); - pfq_clear(); cpu_set_edx(); mmu_perm = 4; pfq_size = (is8086) ? 6 : 4; @@ -953,12 +952,14 @@ reset_common(int hard) if (hard) codegen_reset(); #endif - if (!hard) - flushmmucache(); + if (!hard) + flushmmucache(); x86_was_reset = 1; cpu_alt_reset = 0; + pfq_clear(); prefetching = 1; + takeint = 0; } diff --git a/src/disk/hdc_st506_xt.c b/src/disk/hdc_st506_xt.c index ad78ef0f0..a49e866fe 100644 --- a/src/disk/hdc_st506_xt.c +++ b/src/disk/hdc_st506_xt.c @@ -41,13 +41,13 @@ * Since all controllers (including the ones made by DTC) use * (mostly) the same API, we keep them all in this module. * - * Version: @(#)hdc_st506_xt.c 1.0.16 2019/03/02 + * Version: @(#)hdc_st506_xt.c 1.0.17 2019/10/20 * * Authors: Fred N. van Kempen, * Sarah Walker, * * Copyright 2017-2019 Fred N. van Kempen. - * Copyright 2008-2018 Sarah Walker. + * Copyright 2008-2019 Sarah Walker. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -289,24 +289,6 @@ hd_type_t hd_types[4] = { { 306, 8, MFM_SECTORS } /* type 13 */ }; -hd_type_t wd1002a_wx1_hd_types[8] = { - { 306, 4, MFM_SECTORS }, /* 1023, ? */ - { 612, 4, MFM_SECTORS }, /* 1023, ? */ - { 612, 2, MFM_SECTORS }, /* 1023, ? */ - { 820, 6, MFM_SECTORS }, /* 934, ? */ - { 1024, 8, MFM_SECTORS }, /* 934, ? */ - { 640, 6, MFM_SECTORS }, /* 939, ? */ - { 733, 5, MFM_SECTORS }, /* 939, ? */ - { 977, 5, MFM_SECTORS } /* 1023, ? */ -}; - -hd_type_t wd1002a_27x_hd_types[4] = { - { 981, 5, RLL_SECTORS }, /* type 0 */ - { 987, 7, RLL_SECTORS }, /* type 16 */ - { 612, 4, RLL_SECTORS }, /* type 2 */ - { 615, 4, RLL_SECTORS } /* type 13 */ -}; - #ifdef ENABLE_ST506_XT_LOG int st506_xt_do_log = ENABLE_ST506_XT_LOG;