Revert "Revert "Merge branch 'feature/machine_and_kb' into master""

This reverts commit f2cd3756dd.

src/machine/m_ps1.c

@@ -59,6 +59,7 @@
 #include <86box/hdc_ide.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/port_6x.h>
 #include <86box/sound.h>
 #include <86box/snd_sn76489.h>
 #include <86box/video.h>
@@ -514,6 +515,7 @@ ps1_common_init(const machine_t *model)
     pic2_init();
 
     device_add(&keyboard_ps2_ps1_device);
+    device_add(&port_6x_device);
 
     /* Audio uses ports 200h and 202-207h, so only initialize gameport on 201h. */
     standalone_gameport_type = &gameport_201_device;