Merge branch 'master' of https://github.com/86Box/86Box

src/machine/m_amstrad.c

@@ -2997,7 +2997,7 @@ machine_amstrad_init(const machine_t *model, int type)
         mouse_set_poll(ms_poll, ams);
     }
 
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 }
 
 int

src/machine/m_tandy.c

@@ -995,7 +995,7 @@ machine_tandy1k_init(const machine_t *model, int type)
             break;
     }
 
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 
     eep_data_out = 0x0000;
 }

src/machine/m_xt.c

@@ -57,7 +57,7 @@ machine_xt_common_init(const machine_t *model, int fixed_floppy)
     pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
 
     nmi_init();
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 }
 
 static const device_config_t ibmpc_config[] = {
@@ -690,7 +690,7 @@ machine_xt_tuliptc8_init(const machine_t *model)
     pit_devs[0].set_out_func(pit_devs[0].data, 1, pit_refresh_timer_xt);
 
     nmi_init();
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 
     device_add(&amstrad_megapc_nvr_device);
 

src/machine/m_xt_compaq.c

@@ -56,7 +56,7 @@ machine_xt_compaq_deskpro_init(const machine_t *model)
     if (fdc_current[0] == FDC_INTERNAL)
         device_add(&fdc_xt_device);
     nmi_init();
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 
     lpt1_remove();
     lpt1_setup(LPT_MDA_ADDR);
@@ -84,7 +84,7 @@ machine_xt_compaq_portable_init(const machine_t *model)
         device_add(&fdc_xt_device);
     nmi_init();
     if (joystick_type)
-        device_add(&gameport_device);
+        device_add(&gameport_200_device);
 
     lpt1_remove();
     lpt1_setup(LPT_MDA_ADDR);

src/machine/m_xt_laserxt.c

@@ -464,7 +464,7 @@ machine_xt_laserxt_common_init(const machine_t *model,int is_lxt3)
         device_add(&fdc_xt_device);
 
     nmi_init();
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 
     device_add(is_lxt3 ? &lxt3_device : &laserxt_device);
 

src/machine/m_xt_olivetti.c

@@ -2325,7 +2325,7 @@ machine_xt_m24_init(const machine_t *model)
     /* Address 66-67 = mainboard dip-switch settings */
     io_sethandler(0x0065, 3, m24_read, NULL, NULL, NULL, NULL, NULL, NULL);
 
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 
     nmi_init();
 
@@ -2397,7 +2397,7 @@ machine_xt_m240_init(const machine_t *model)
         device_add(&fdc_at_device); /* io.c logs clearly show it using port 3F7 */
 
     if (joystick_type)
-        device_add(&gameport_device);
+        device_add(&gameport_200_device);
 
     nmi_init();
 

src/machine/m_xt_philips.c

@@ -158,7 +158,7 @@ machine_xt_philips_common_init(const machine_t *model)
 
     nmi_init();
 
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
 
     device_add(&keyboard_pc_device);
 

src/machine/m_xt_xi8088.c

@@ -209,7 +209,7 @@ machine_xt_xi8088_init(const machine_t *model)
     nmi_init();
     device_add(&ibmat_nvr_device);
     pic2_init();
-    standalone_gameport_type = &gameport_device;
+    standalone_gameport_type = &gameport_200_device;
     device_add(&sst_flash_39sf010_device);
 
     return ret;