Another big change, this time to the NVR. It has been re-done, integrated with the RTC code, and is now ready to be used by other, non-AT-compatible systems, including an ISA card for PC/XT.

src/machine/machine_amstrad.c

@@ -144,7 +144,10 @@ void machine_amstrad_init(void)
 	mem_add_bios();
         amstrad_init();
         keyboard_amstrad_init();
-        nvr_init();
+
+	/* FIXME: make sure this is correct? */
+        nvr_at_init(1);
+
 	nmi_init();
 	fdc_set_dskchg_activelow();
 	if (joystick_type != 7)

src/machine/machine_at.c

@@ -30,7 +30,7 @@ void machine_at_init(void)
         pit_set_out_func(&pit, 1, pit_refresh_timer_at);
         dma16_init();
         keyboard_at_init();
-        nvr_init();
+        nvr_at_init(8);
         pic2_init();
 	if (joystick_type != 7)
 		device_add(&gameport_device);

src/machine/machine_olivetti_m24.c

@@ -42,7 +42,10 @@ void machine_olim24_init(void)
         machine_common_init();
 	mem_add_bios();
         keyboard_olim24_init();
-        nvr_init();
+
+	/* FIXME: make sure this is correct?? */
+        nvr_at_init(8);
+
         olivetti_m24_init();
 	nmi_init();
 	if (joystick_type != 7)  device_add(&gameport_device);

src/machine/machine_ps1.c

@@ -348,7 +348,7 @@ static void machine_ps1_common_init(void)
 		ide_init();
 	}
         keyboard_at_init();
-        nvr_init();
+        nvr_at_init(8);
         pic2_init();
 	if (romset != ROM_IBMPS1_2133)
 	{			

src/machine/machine_ps2_isa.c

@@ -163,7 +163,7 @@ void machine_ps2_m30_286_init(void)
         pit_set_out_func(&pit, 1, pit_refresh_timer_at);
         dma16_init();
         keyboard_at_init();
-        nvr_init();
+        nvr_at_init(8);
         pic2_init();
         ps2board_init();
         fdc_set_dskchg_activelow();

src/machine/machine_ps2_mca.c

@@ -813,7 +813,7 @@ static void machine_ps2_common_init(void)
         keyboard_at_init();
         keyboard_at_init_ps2();
         mouse_ps2_init();
-        nvr_init();
+        nvr_at_init(8);
         pic2_init();
 
         pit_ps2_init();