Major changes to NVR, system initialization (pc.c), and what goes on in the Windows startup (win.c.) Not fully done yet, but good enough for a first commit.

src/machine/machine.c

@@ -8,7 +8,7 @@
  *
  *		Handling of the emulated machines.
  *
- * Version:	@(#)machine.c	1.0.16	2017/09/30
+ * Version:	@(#)machine.c	1.0.17	2017/10/04
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -172,14 +172,14 @@ machine_init(void)
 
     AMSTRAD = AT = PCI = TANDY = 0;
 
-    io_init();
-
-    fdc_update_is_nsc(0);
-
-    machines[machine].init();
+    /* Load the machine's ROM BIOS. */
+    rom_load_bios(romset);
+    mem_add_bios();
 
     if (machines[machine].get_device)
 	device_add(machines[machine].get_device());
+
+    machines[machine].init();
 }
 
 

src/machine/machine_at.c

@@ -24,16 +24,20 @@ void machine_at_init(void)
 	AT = 1;
 
         machine_common_init();
+        pit_set_out_func(&pit, 1, pit_refresh_timer_at);
+        pic2_init();
+        dma16_init();
+
 	if (lpt_enabled)
 		lpt2_remove();
-	mem_add_bios();
-        pit_set_out_func(&pit, 1, pit_refresh_timer_at);
-        dma16_init();
-        keyboard_at_init();
+
         nvr_at_init(8);
-        pic2_init();
+
+        keyboard_at_init();
+
 	if (joystick_type != 7)
 		device_add(&gameport_device);
+
 	if (bugger_enabled)
 		bugger_init();
 }
@@ -41,17 +45,20 @@ void machine_at_init(void)
 void machine_at_ide_init(void)
 {
 	machine_at_init();
+
 	ide_init();
 }
 
 void machine_at_top_remap_init(void)
 {
 	machine_at_init();
+
 	mem_remap_top_384k();
 }
 
 void machine_at_ide_top_remap_init(void)
 {
 	machine_at_ide_init();
+
 	mem_remap_top_384k();
 }

src/machine/machine_common.c

@@ -21,8 +21,6 @@ void machine_common_init(void)
         pic_init();
         pit_init();
 
-        fdc_add();
-
 	if (lpt_enabled)
 	{
 		lpt_init();
@@ -37,4 +35,6 @@ void machine_common_init(void)
 	{
 		serial_setup(2, SERIAL2_ADDR, SERIAL2_IRQ);
 	}
+
+        fdc_add();
 }