Finalized changing the 286-based systems to have an "internal ide" controller; these machines now have to select the desired HD controller from the menu. The Samsung 286 machine also needs its upper 384K remapped. Added machine_at_scat_remap() to implement thjs for SCAT-based boards.

2017-09-18 22:38:15 -04:00
parent aea3b1e34f
commit ef677295f7
5 changed files with 16 additions and 28 deletions
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -8,7 +8,7 @@
 *
 *		Handling of the emulated machines.
 *
- * Version:	@(#)machine.c	1.0.12	2017/09/15
+ * Version:	@(#)machine.c	1.0.13	2017/09/18
 *
 * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
 *		Miran Grca, <mgrca8@gmail.com>
@@ -81,7 +81,7 @@ machine_t machines[] =
        {"[8088] Generic XT clone",		ROM_GENXT,		"genxt",		{{"",      cpus_8088},        {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, 0,								 64,  640,  64,   0,		      machine_xt_init, NULL			},
        {"[8088] Juko XT clone",		ROM_JUKOPC,		"jukopc",		{{"",      cpus_8088},        {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, 0,								 64,  640,  64,   0,		      machine_xt_init, NULL			},
        {"[8088] Phoenix XT clone",		ROM_PXXT,		"pxxt",			{{"",      cpus_8088},        {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, 0,								 64,  640,  64,   0,		      machine_xt_init, NULL			},
-        {"[8088] Schneider EuroPC",		ROM_EUROPC,		"europc",		{{"Siemens",      cpus_europc},      {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, 0,								512,  640, 128,   0,		  machine_europc_init, NULL			},
+        {"[8088] Schneider EuroPC",		ROM_EUROPC,		"europc",		{{"Siemens",cpus_europc},     {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, 0,								512,  640, 128,   0,		  machine_europc_init, NULL			},
        {"[8088] Tandy 1000",			ROM_TANDY,		"tandy",		{{"",      cpus_8088},        {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 1, 0,								128,  640, 128,   0,		 machine_tandy1k_init, tandy1000_get_device	},
        {"[8088] Tandy 1000 HX",		ROM_TANDY1000HX,	"tandy1000hx",		{{"",      cpus_8088},        {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 1, 0,								256,  640, 128,   0,		 machine_tandy1k_init, tandy1000hx_get_device	},
        {"[8088] VTech Laser Turbo XT",		ROM_LTXT,		"ltxt",			{{"",      cpus_8088},        {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, 0,								 64, 1152,  64,   0,	      machine_xt_laserxt_init, NULL			},
@@ -95,26 +95,14 @@ machine_t machines[] =
        {"[8086] Sinclair PC200",		ROM_PC200,		"pc200",		{{"",      cpus_8086},        {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 1, MACHINE_AMSTRAD,							512,  640, 128,  63,		 machine_amstrad_init, NULL			},
        {"[8086] Tandy 1000 SL/2",		ROM_TANDY1000SL2,	"tandy1000sl2",		{{"",      cpus_8086},        {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 1, 0,								512,  768, 128,   0,	      machine_tandy1ksl2_init, NULL			},

-#ifdef WALTJE
-        {"[286 ISA] AMI 286 clone",		ROM_AMI286,		"ami286",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT,					512,16384, 128, 127,		 machine_at_neat_init, NULL			},
-#else
-        {"[286 ISA] AMI 286 clone",		ROM_AMI286,		"ami286",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT | MACHINE_HAS_IDE,					512,16384, 128, 127,		 machine_at_neat_init, NULL			},
-#endif
-        {"[286 ISA] Award 286 clone",		ROM_AWARD286,		"award286",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT | MACHINE_HAS_IDE,					512,16384, 128, 127,		 machine_at_scat_init, NULL			},
-        {"[286 ISA] Commodore PC 30 III",	ROM_CMDPC30,		"cmdpc30",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT | MACHINE_HAS_IDE,					640,16384, 128, 127,		machine_at_cmdpc_init, NULL			},
-#ifdef WALTJE
-        {"[286 ISA] Hyundai Super-286TR",	ROM_SUPER286TR,		"super286tr",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT,					512,16384, 128, 127,		 machine_at_scat_init, NULL			},
-#else
-        {"[286 ISA] Hyundai Super-286TR",	ROM_SUPER286TR,		"super286tr",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT | MACHINE_HAS_IDE,					512,16384, 128, 127,		 machine_at_scat_init, NULL			},
-#endif
+        {"[286 ISA] AMI 286 clone",		ROM_AMI286,		"ami286",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT,							512,16384, 128, 127,		 machine_at_neat_init, NULL			},
+        {"[286 ISA] Award 286 clone",		ROM_AWARD286,		"award286",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT,							512,16384, 128, 127,		 machine_at_scat_init, NULL			},
+        {"[286 ISA] Commodore PC 30 III",	ROM_CMDPC30,		"cmdpc30",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT,							640,16384, 128, 127,		machine_at_cmdpc_init, NULL			},
+        {"[286 ISA] Hyundai Super-286TR",	ROM_SUPER286TR,		"super286tr",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT,							512,16384, 128, 127,		 machine_at_scat_init, NULL			},
        {"[286 ISA] IBM AT",			ROM_IBMAT,		"ibmat",		{{"",      cpus_ibmat},       {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT,							256,15872, 128,  63,	    machine_at_top_remap_init, NULL			},
        {"[286 ISA] IBM PS/1 model 2011",	ROM_IBMPS1_2011,	"ibmps1es",		{{"",      cpus_ps1_m2011},   {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 1, MACHINE_AT | MACHINE_PS2 | MACHINE_PS2_HDD,			512,16384, 512, 127,	       machine_ps1_m2011_init, NULL			},
        {"[286 ISA] IBM PS/2 model 30-286",	ROM_IBMPS2_M30_286,	"ibmps2_m30_286",	{{"",      cpus_ps2_m30_286}, {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 1, MACHINE_AT | MACHINE_PS2 | MACHINE_PS2_HDD,			  1,   16,   1, 127,	     machine_ps2_m30_286_init, NULL			},
-#ifdef WALTJE
-        {"[286 ISA] Samsung SPC-4200P",		ROM_SPC4200P,		"spc4200p",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT | MACHINE_PS2,			512,16384, 128, 127,		 machine_at_scat_spc4200p_init, NULL			},
-#else
-        {"[286 ISA] Samsung SPC-4200P",		ROM_SPC4200P,		"spc4200p",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT | MACHINE_PS2 | MACHINE_HAS_IDE,			512,16384, 128, 127,		 machine_at_scat_init, NULL			},
-#endif
+        {"[286 ISA] Samsung SPC-4200P",		ROM_SPC4200P,		"spc4200p",		{{"",      cpus_286},         {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 0, MACHINE_AT | MACHINE_PS2,					512,16384, 128, 127,	machine_at_scat_remap_init, NULL			},

        {"[286 MCA] IBM PS/2 model 50",		ROM_IBMPS2_M50,		"ibmps2_m50",		{{"",      cpus_ps2_m30_286}, {"",    NULL},         {"",      NULL},        {"",      NULL},     {"",      NULL}}, 1, MACHINE_AT | MACHINE_PS2 | MACHINE_PS2_HDD | MACHINE_MCA,	  1,   16,   1,  63,	    machine_ps2_model_50_init, NULL			},

--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -8,12 +8,12 @@
 *
 *		Handling of the emulated machines.
 *
- * Version:	@(#)machine.h	1.0.3	2017/09/02
+ * Version:	@(#)machine.h	1.0.4	2017/09/18
 *
 * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
 *		Miran Grca, <mgrca8@gmail.com>
 *		Copyright 2008-2017 Sarah Walker.
- *		Copyright 2016-2017 Miran Grca.
+ *		Copyright 2016,2017 Miran Grca.
 */
 #ifndef EMU_MACHINE_H
 # define EMU_MACHINE_H
--- a/src/machine/machine_at_neat.c
+++ b/src/machine/machine_at_neat.c
@@ -83,10 +83,7 @@ static void neat_init(void)

 void machine_at_neat_init(void)
 {
-#ifdef WALTJE
        machine_at_init();
-#else
-        machine_at_ide_init();
-#endif
+
        neat_init();
 }
--- a/src/machine/machine_at_scat.c
+++ b/src/machine/machine_at_scat.c
@@ -551,14 +551,17 @@ static void scat_init(void)

 void machine_at_scat_init(void)
 {
-        machine_at_ide_init();
+        machine_at_init();
+
        scat_init();
 }


-void machine_at_scat_spc4200p_init(void)
+void machine_at_scat_remap_init(void)
 {
 	machine_at_init();
+
 	mem_remap_top_384k();
+
        scat_init();
 }
--- a/src/machine/machine_at_scat.h
+++ b/src/machine/machine_at_scat.h
@@ -1,2 +1,2 @@
 extern void machine_at_scat_init(void);
-extern void machine_at_scat_spc4200p_init(void);
+extern void machine_at_scat_remap_init(void);