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

This reverts commit f2cd3756dd.

src/machine/m_at.c

@@ -56,6 +56,7 @@
 #include <86box/lpt.h>
 #include <86box/rom.h>
 #include <86box/hdc.h>
+#include <86box/port_6x.h>
 #include <86box/machine.h>
 
 
@@ -69,6 +70,10 @@ machine_at_common_init_ex(const machine_t *model, int type)
     pic2_init();
     dma16_init();
 
+    if (!(type & 4))
+	device_add(&port_6x_device);
+    type &= 3;
+
     if (type == 1)
 	device_add(&ibmat_nvr_device);
     else if (type == 0)