Removed debug from JSON driver. Updated AT MFM (WD1003) driver to properly operate with Microport SysV/AT. Optionally remove the IDE controllers from teh 286's (#if WALTJE for now) as those machines did not really have IDE, but the WD1003 or an ESDI controller at best.

src/floppy/floppy_json.c

@@ -8,7 +8,7 @@
  *
  *		Implementation of the PCjs JSON floppy image format.
  *
- * Version:	@(#)floppy_json.c	1.0.1	2017/09/12
+ * Version:	@(#)floppy_json.c	1.0.2	2017/09/16
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Copyright 2017 Fred N. van Kempen.
@@ -122,10 +122,6 @@ handle(json_t *img, char *name, char *str)
 		l >>= 8;
 		*p++ = (l & 0x000000ff);
 	}
-#if 1
-	pclog("JSON: added sector (%d,%d,%d/%d) size=%d pat=%08lx\n",
-		sec->track,sec->side,sec->sector,img->dmf,sec->size,pat);
-#endif
     } else if (! strcmp(name, "data")) {
 	if (sec->data == NULL)
 		sec->data = (uint8_t *)malloc(sec->size);
@@ -135,11 +131,6 @@ handle(json_t *img, char *name, char *str)
 		if (sp != NULL) *sp++ = '\0';
 		l = atol(str);
 
-#if 1
-		if (p==sec->data)
-		    pclog("JSON: added sector (%d,%d,%d/%d) size=%d data=%08lx\n",
-			sec->track,sec->side,sec->sector,img->dmf,sec->size,l);
-#endif
 		*p++ = (l & 0x000000ff);
 		l >>= 8;
 		*p++ = (l & 0x000000ff);

src/machine/machine.c

@@ -8,7 +8,7 @@
  *
  *		Handling of the emulated machines.
  *
- * Version:	@(#)machine.c	1.0.11	2017/09/03
+ * Version:	@(#)machine.c	1.0.12	2017/09/15
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -95,14 +95,26 @@ 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] 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 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			},
 

src/machine/machine_at_neat.c

@@ -83,6 +83,10 @@ static void neat_init(void)
 
 void machine_at_neat_init(void)
 {
+#ifdef WALTJE
+        machine_at_init();
+#else
         machine_at_ide_init();
+#endif
         neat_init();
 }

src/machine/machine_at_scat.c

@@ -554,3 +554,11 @@ void machine_at_scat_init(void)
         machine_at_ide_init();
         scat_init();
 }
+
+
+void machine_at_scat_spc4200p_init(void)
+{
+	machine_at_init();
+	mem_remap_top_384k();
+        scat_init();
+}

src/machine/machine_at_scat.h

@@ -1 +1,2 @@
 extern void machine_at_scat_init(void);
+extern void machine_at_scat_spc4200p_init(void);