Bring the Olivetti M290 out of the Dev branch.

src/machine/CMakeLists.txt

@@ -57,10 +57,6 @@ add_library(mch OBJECT
     m_at_misc.c
 )
 
-if(OLIVETTI)
-    target_compile_definitions(mch PRIVATE USE_OLIVETTI)
-endif()
-
 if(OPEN_AT)
     target_compile_definitions(mch PRIVATE USE_OPEN_AT)
 endif()

src/machine/m_at_286_386sx.c

@@ -1069,7 +1069,6 @@ machine_at_pc916sx_init(const machine_t *model)
     return ret;
 }
 
-#ifdef USE_OLIVETTI
 int
 machine_at_m290_init(const machine_t *model)
 {
@@ -1081,15 +1080,16 @@ machine_at_m290_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init_ex(model, 4);
-    device_add(&keyboard_at_olivetti_device);
+    machine_at_common_init_ex(model, 6);
+    device_add(&amstrad_megapc_nvr_device);
+
+    device_add(&olivetti_eva_device);
     device_add(&port_6x_olivetti_device);
 
     if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_at_device);
 
-    device_add(&olivetti_eva_device);
+    device_add(&keyboard_at_olivetti_device);
 
     return ret;
 }
-#endif /* USE_OLIVETTI */

src/machine/machine_table.c

@@ -3096,7 +3096,6 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-#ifdef USE_OLIVETTI
     /* Has Olivetti KBC firmware. */
     {
         .name = "[ISA] Olivetti M290",
@@ -3137,7 +3136,6 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-#endif /* USE_OLIVETTI */
 #ifdef USE_OPEN_AT
     /* Has IBM AT KBC firmware. */
     {