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

src/config.c

@@ -1,4 +1,4 @@
-/*
+/*
  * 86Box	A hypervisor and IBM PC system emulator that specializes in
  *		running old operating systems and software designed for IBM
  *		PC systems and compatibles from 1981 through fairly recent
@@ -715,7 +715,20 @@ load_input_devices(void)
       else
 	mouse_type = 0;
 
-    joystick_type = config_get_int(cat, "joystick_type", JOYSTICK_TYPE_NONE);
+    p = config_get_string(cat, "joystick_type", NULL);
+    if (p != NULL) {
+	joystick_type = joystick_get_from_internal_name(p);
+	if (!joystick_type) {
+		/* Try to read an integer for backwards compatibility with old configs */
+		c = config_get_int(cat, "joystick_type", 8);
+		if ((c >= 0) && (c < 8))
+			/* "None" was type 8 instead of 0 previously, shift the number accordingly */
+			joystick_type = c + 1;
+		else
+			joystick_type = 0;
+	}
+    } else
+	joystick_type = 0;
 
     for (c=0; c<joystick_get_max_joysticks(joystick_type); c++) {
 	sprintf(temp, "joystick_%i_nr", c);
@@ -1672,7 +1685,6 @@ config_load(void)
 	gfxcard = video_get_video_from_internal_name("cga");
 	vid_api = plat_vidapi("default");
 	time_sync = TIME_SYNC_ENABLED;
-	joystick_type = JOYSTICK_TYPE_NONE;
 	hdc_current = hdc_get_from_internal_name("none");
 	serial_enabled[0] = 1;
 	serial_enabled[1] = 1;
@@ -1977,7 +1989,7 @@ save_input_devices(void)
 
     config_set_string(cat, "mouse_type", mouse_get_internal_name(mouse_type));
 
-    if (joystick_type == JOYSTICK_TYPE_NONE) {
+    if (!joystick_type) {
 	config_delete_var(cat, "joystick_type");
 
 	for (c = 0; c < 16; c++) {
@@ -1998,7 +2010,7 @@ save_input_devices(void)
 		}
 	}
     } else {
-	config_set_int(cat, "joystick_type", joystick_type);
+	config_set_string(cat, "joystick_type", joystick_get_internal_name(joystick_type));
 
 	for (c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
 		sprintf(tmp2, "joystick_%i_nr", c);

src/device/keyboard_at.c

@@ -86,6 +86,7 @@
 #define KBC_VEN_IBM_PS1		0x18
 #define KBC_VEN_ACER		0x1c
 #define KBC_VEN_INTEL_AMI	0x20
+#define KBC_VEN_OLIVETTI	0x24
 #define KBC_VEN_MASK		0x3c
 
 
@@ -830,6 +831,8 @@ add_data_kbd(uint16_t val)
     int translate = (keyboard_mode & 0x40);
     uint8_t fake_shift[4];
     uint8_t num_lock = 0, shift_states = 0;
+	uint8_t kbc_ven = 0x0;
+	kbc_ven = dev->flags & KBC_VEN_MASK;
 
     if (dev->reset_delay)
 	return;
@@ -855,7 +858,7 @@ add_data_kbd(uint16_t val)
     }
 
     /* Test for T3100E 'Fn' key (Right Alt / Right Ctrl) */
-    if ((dev != NULL) && ((dev->flags & KBC_VEN_MASK) == KBC_VEN_TOSHIBA) &&
+    if ((dev != NULL) && (kbc_ven == KBC_VEN_TOSHIBA) &&
 	(keyboard_recv(0xb8) || keyboard_recv(0x9d))) switch (val) {
 	case 0x4f: t3100e_notify_set(0x01); break; /* End */
 	case 0x50: t3100e_notify_set(0x02); break; /* Down */
@@ -1065,6 +1068,8 @@ static void
 write_cmd(atkbd_t *dev, uint8_t val)
 {
     kbd_log("ATkbc: write command byte: %02X (old: %02X)\n", val, dev->mem[0]);
+	uint8_t kbc_ven = 0x0;
+	kbc_ven = dev->flags & KBC_VEN_MASK;
 
     if ((val & 1) && (dev->status & STAT_OFULL))
 	dev->wantirq = 1;
@@ -1086,7 +1091,7 @@ write_cmd(atkbd_t *dev, uint8_t val)
     /* ISA AT keyboard controllers use bit 5 for keyboard mode (1 = PC/XT, 2 = AT);
        PS/2 (and EISA/PCI) keyboard controllers use it as the PS/2 mouse enable switch.
        The AMIKEY firmware apparently uses this bit for something else. */
-    if (((dev->flags & KBC_VEN_MASK) == KBC_VEN_AMI) ||
+    if ((kbc_ven == KBC_VEN_AMI) ||
         ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_NOREF)) {
 	keyboard_mode &= ~CCB_PCMODE;
 
@@ -1138,6 +1143,9 @@ write64_generic(void *priv, uint8_t val)
 {
     atkbd_t *dev = (atkbd_t *)priv;
     uint8_t current_drive, fixed_bits;
+	uint8_t kbc_ven = 0x0;
+	kbc_ven = dev->flags & KBC_VEN_MASK;
+
 
     switch (val) {
 	case 0xa4:	/* check if password installed */
@@ -1181,9 +1189,9 @@ write64_generic(void *priv, uint8_t val)
 		kbd_log("ATkbc: read input port\n");
 		fixed_bits = 4;
 		/* The SMM handlers of Intel AMI Pentium BIOS'es expect bit 6 to be set. */
-		if ((dev->flags & KBC_VEN_MASK) == KBC_VEN_INTEL_AMI)
+		if (kbc_ven == KBC_VEN_INTEL_AMI)
 			fixed_bits |= 0x40;
-		if ((dev->flags & KBC_VEN_MASK) == KBC_VEN_IBM_PS1) {
+		if (kbc_ven == KBC_VEN_IBM_PS1) {
 			current_drive = fdc_get_current_drive();
 			add_to_kbc_queue_front(dev, dev->input_port | fixed_bits | (fdd_is_525(current_drive) ? 0x40 : 0x00));
 			dev->input_port = ((dev->input_port + 1) & 3) |
@@ -1616,8 +1624,11 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
     int i = 0;
     int bad = 1;
     uint8_t mask;
+	uint8_t kbc_ven = 0x0;
+	kbc_ven = dev->flags & KBC_VEN_MASK;
 
-    if (((dev->flags & KBC_VEN_MASK) == KBC_VEN_XI8088) && (port == 0x63))
+
+    if ((kbc_ven == KBC_VEN_XI8088) && (port == 0x63))
 	port = 0x61;
 
     kbd_log((port == 0x61) ? "" : "ATkbc: write(%04X, %02X)\n", port, val);
@@ -1894,7 +1905,7 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
 			was_speaker_enable = 1;
 		pit_ctr_set_gate(&pit->counters[2], val & 1);
 
-                if ((dev->flags & KBC_VEN_MASK) == KBC_VEN_XI8088)
+		if (kbc_ven == KBC_VEN_XI8088)
 			xi8088_turbo_set(!!(val & 0x04));
 		break;
 
@@ -1930,7 +1941,7 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
 
 			case 0xaa:	/* self-test */
 				kbd_log("ATkbc: self-test\n");
-				if ((dev->flags & KBC_VEN_MASK) == KBC_VEN_TOSHIBA)
+				if (kbc_ven == KBC_VEN_TOSHIBA)
 					dev->status |= STAT_IFULL;
 				if (! dev->initialized) {
 					kbd_log("ATkbc: self-test reinitialization\n");
@@ -2045,11 +2056,13 @@ kbd_read(uint16_t port, void *priv)
 {
     atkbd_t *dev = (atkbd_t *)priv;
     uint8_t ret = 0xff;
+	uint8_t kbc_ven = 0x0;
+	kbc_ven = dev->flags & KBC_VEN_MASK;
 
     if ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_NOREF)
 	cycles -= ISA_CYCLES(8);
 
-    if (((dev->flags & KBC_VEN_MASK) == KBC_VEN_XI8088) && (port == 0x63))
+    if ((kbc_ven == KBC_VEN_XI8088) && (port == 0x63))
 	port = 0x61;
 
     switch (port) {
@@ -2078,7 +2091,7 @@ kbd_read(uint16_t port, void *priv)
 			else
 				ret &= ~0x10;
 		}
-                if ((dev->flags & KBC_VEN_MASK) == KBC_VEN_XI8088) {
+		if (kbc_ven == KBC_VEN_XI8088) {
 			if (xi8088_turbo_get())
 					ret |= 0x04;
 				else
@@ -2086,6 +2099,39 @@ kbd_read(uint16_t port, void *priv)
 		}
 		break;
 
+	case 0x62:
+		ret = 0xff;
+		if (kbc_ven == KBC_VEN_OLIVETTI) {
+			/* SWA on Olivetti M240 mainboard (off=1) */
+			ret = 0x00;
+			if (ppi.pb & 0x8) {
+				/* Switches 4, 5 - floppy drives (number) */
+				int i, fdd_count = 0;
+				for (i = 0; i < FDD_NUM; i++) {
+				    if (fdd_get_flags(i))
+				        fdd_count++;
+				}
+				if (!fdd_count)
+					ret |= 0x00;
+				else
+					ret |= ((fdd_count - 1) << 2);
+				/* Switches 6, 7 - monitor type */
+				if (video_is_mda())
+					ret |= 0x3;
+				else if (video_is_cga())
+					ret |= 0x2;	/* 0x10 would be 40x25 */
+				else
+					ret |= 0x0;
+				ret = 0xff;
+			} else {
+				/* bit 2 always on */
+				ret |= 0x4;
+				/* Switch 8 - 8087 FPU. */
+				if (hasfpu)
+	            	ret |= 0x02;
+			}
+		}
+		break;
 	case 0x64:
 		ret = (dev->status & 0xfb);
 		if (dev->mem[0] & STAT_SYSFLAG)
@@ -2094,7 +2140,7 @@ kbd_read(uint16_t port, void *priv)
 		   PS/2 controller, it is the keyboard/mouse output source bit. */
 		dev->status &= ~STAT_RTIMEOUT;
 		if (((dev->flags & KBC_TYPE_MASK) > KBC_TYPE_PS2_NOREF) && 
-		   ((dev->flags & KBC_VEN_MASK) != KBC_VEN_IBM_MCA))
+		   (kbc_ven != KBC_VEN_IBM_MCA))
 			dev->status &= ~STAT_TTIMEOUT;
 		break;
 
@@ -2124,6 +2170,8 @@ kbd_reset(void *priv)
 {
     atkbd_t *dev = (atkbd_t *)priv;
     int i;
+	uint8_t kbc_ven = 0x0;
+	kbc_ven = dev->flags & KBC_VEN_MASK;
 
     dev->initialized = 0;
     dev->first_write = 1;
@@ -2139,7 +2187,7 @@ kbd_reset(void *priv)
     dev->key_wantdata = 0;
 
     /* Set up the correct Video Type bits. */
-    if (((dev->flags & KBC_VEN_MASK) == KBC_VEN_XI8088) || ((dev->flags & KBC_VEN_MASK) == KBC_VEN_ACER))
+    if ((kbc_ven == KBC_VEN_XI8088) || (kbc_ven == KBC_VEN_ACER))
 		dev->input_port = video_is_mda() ? 0xb0 : 0xf0;
     else
 		dev->input_port = video_is_mda() ? 0xf0 : 0xb0;
@@ -2228,6 +2276,7 @@ kbd_init(const device_t *info)
     switch(dev->flags & KBC_VEN_MASK) {
 	case KBC_VEN_ACER:
 	case KBC_VEN_GENERIC:
+	case KBC_VEN_OLIVETTI:
 	case KBC_VEN_IBM_PS1:
 	case KBC_VEN_XI8088:
 		dev->write64_ven = write64_generic;
@@ -2291,6 +2340,16 @@ const device_t keyboard_at_toshiba_device = {
     { NULL }, NULL, NULL, NULL
 };
 
+const device_t keyboard_at_olivetti_device = {
+    "PC/AT Keyboard (Olivetti)",
+    0,
+    KBC_TYPE_ISA | KBC_VEN_OLIVETTI,
+    kbd_init,
+    kbd_close,
+    kbd_reset,
+    { NULL }, NULL, NULL, NULL
+};
+
 const device_t keyboard_ps2_device = {
     "PS/2 Keyboard",
     0,

src/device/keyboard_xt.c

@@ -13,10 +13,12 @@
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
+ *      EngiNerd, <webmaster.crrc@yahoo.it>
  *
  *		Copyright 2008-2019 Sarah Walker.
  *		Copyright 2016-2019 Miran Grca.
  *		Copyright 2017-2019 Fred N. van kempen.
+ *      Copyright 2020 EngiNerd.
  */
 #include <stdio.h>
 #include <stdint.h>
@@ -551,7 +553,15 @@ kbd_read(uint16_t port, void *priv)
 				ret = ((mem_size-64) / 32) & 0x0f;
 			else
 				ret = ((mem_size-64) / 32) >> 4;
-		} else {
+		} 
+        else if (kbd->type == 8) {
+            /* Olivetti M19 */
+            if (kbd->pb & 0x04)
+				ret = kbd->pd;
+            else 
+                ret = kbd->pd >> 4;
+        } 
+        else {
 			if (kbd->pb & 0x08)
 				ret = kbd->pd >> 4;
 			else {
@@ -623,18 +633,27 @@ kbd_init(const device_t *info)
 
     video_reset(gfxcard);
 
-    if (kbd->type <= 3) {
+    if (kbd->type <= 3 || kbd-> type == 8) {
         for (i = 0; i < FDD_NUM; i++) {
             if (fdd_get_flags(i))
                 fdd_count++;
         }
 
         /* DIP switch readout: bit set = OFF, clear = ON. */
+        if (kbd->type != 8)
             /* Switches 7, 8 - floppy drives. */
             if (!fdd_count)
                 kbd->pd = 0x00;
             else
                 kbd->pd = ((fdd_count - 1) << 6) | 0x01;
+        else 
+            /* Jumpers J1, J2 - monitor type. 
+                * 01 - mono (high-res)
+                * 10 - color (low-res, disables 640x400x2 mode)
+                * 00 - autoswitching
+                */
+            kbd->pd |= 0x00;
+        
         /* Switches 5, 6 - video. */
         if (video_is_mda())
             kbd->pd |= 0x30;
@@ -642,7 +661,10 @@ kbd_init(const device_t *info)
             kbd->pd |= 0x20;	/* 0x10 would be 40x25 */
         else
             kbd->pd |= 0x00;
+        
         /* Switches 3, 4 - memory size. */
+        // Note to Compaq/Toshiba keyboard maintainers: type 4 and 6 will never be activated in this block
+        // Should the top if be closed right after setting floppy drive count?
         if ((kbd->type == 3) || (kbd->type == 4) || (kbd->type == 6)) {
             switch (mem_size) {
                 case 256:
@@ -812,3 +834,13 @@ const device_t keyboard_xt_lxt3_device = {
     { NULL }, NULL, NULL
 };
 #endif
+
+const device_t keyboard_xt_olivetti_device = {
+    "Olivetti XT Keyboard",
+    0,
+    8,
+    kbd_init,
+    kbd_close,
+    kbd_reset,
+    { NULL }, NULL, NULL
+};

src/game/gameport.c

@@ -68,11 +68,11 @@ typedef struct _gameport_ {
 } gameport_t;
 
 
-int	joystick_type;
+int	joystick_type = 0;
 
 
 static const joystick_if_t joystick_none = {
-    "No joystick",
+    "None",
     NULL,
     NULL,
     NULL,
@@ -85,17 +85,20 @@ static const joystick_if_t joystick_none = {
 };
 
 
-static const joystick_if_t *joystick_list[] = {
+static const struct {
-    &joystick_standard,
+    const char		*internal_name;
-    &joystick_standard_4button,
+    const joystick_if_t	*joystick;
-    &joystick_standard_6button,
+} joysticks[] = {
-    &joystick_standard_8button,
+    { "none",			&joystick_none			},
-    &joystick_4axis_4button,
+    { "standard_2button",	&joystick_standard		},
-    &joystick_ch_flightstick_pro,
+    { "standard_4button",	&joystick_standard_4button	},
-    &joystick_sw_pad,
+    { "standard_6button",	&joystick_standard_6button	},
-    &joystick_tm_fcs,
+    { "standard_8button",	&joystick_standard_8button	},
-    &joystick_none,
+    { "4axis_4button",		&joystick_4axis_4button		},
-    NULL
+    { "ch_flighstick_pro",	&joystick_ch_flightstick_pro	},
+    { "sidewinder_pad",		&joystick_sw_pad		},
+    { "thrustmaster_fcs",	&joystick_tm_fcs		},
+    { "",			NULL				}
 };
 static gameport_t *gameport_global = NULL;
 
@@ -103,58 +106,81 @@ static gameport_t *gameport_global = NULL;
 char *
 joystick_get_name(int js)
 {
-    if (! joystick_list[js])
+    if (! joysticks[js].joystick)
 	return(NULL);
-    return((char *)joystick_list[js]->name);
+    return((char *)joysticks[js].joystick->name);
+}
+
+
+char *
+joystick_get_internal_name(int js)
+{
+    return((char *) joysticks[js].internal_name);
+}
+
+
+int
+joystick_get_from_internal_name(char *s)
+{
+    int c = 0;
+
+    while (strlen((char *) joysticks[c].internal_name))
+    {
+	if (!strcmp((char *) joysticks[c].internal_name, s))
+		return c;
+	c++;
+    }
+
+    return 0;
 }
 
 
 int
 joystick_get_max_joysticks(int js)
 {
-    return(joystick_list[js]->max_joysticks);
+    return(joysticks[js].joystick->max_joysticks);
 }
 
 
 int
 joystick_get_axis_count(int js)
 {
-    return(joystick_list[js]->axis_count);
+    return(joysticks[js].joystick->axis_count);
 }
 
 
 int
 joystick_get_button_count(int js)
 {
-    return(joystick_list[js]->button_count);
+    return(joysticks[js].joystick->button_count);
 }
 
 
 int
 joystick_get_pov_count(int js)
 {
-    return(joystick_list[js]->pov_count);
+    return(joysticks[js].joystick->pov_count);
 }
 
 
 char *
 joystick_get_axis_name(int js, int id)
 {
-    return((char *)joystick_list[js]->axis_names[id]);
+    return((char *)joysticks[js].joystick->axis_names[id]);
 }
 
 
 char *
 joystick_get_button_name(int js, int id)
 {
-    return((char *)joystick_list[js]->button_names[id]);
+    return((char *)joysticks[js].joystick->button_names[id]);
 }
 
 
 char *
 joystick_get_pov_name(int js, int id)
 {
-    return (char *)joystick_list[js]->pov_names[id];
+    return (char *)joysticks[js].joystick->pov_names[id];
 }
 
 
@@ -239,7 +265,7 @@ init_common(void)
     timer_add(&p->axis[2].timer, timer_over, &p->axis[2], 0);
     timer_add(&p->axis[3].timer, timer_over, &p->axis[3], 0);
 
-    p->joystick = joystick_list[joystick_type];
+    p->joystick = joysticks[joystick_type].joystick;
     p->joystick_dat = p->joystick->init();
 
     gameport_global = p;
@@ -255,7 +281,7 @@ gameport_update_joystick_type(void)
 
     if (p != NULL) {
 	p->joystick->close(p->joystick_dat);
-	p->joystick = joystick_list[joystick_type];
+	p->joystick = joysticks[joystick_type].joystick;
 	p->joystick_dat = p->joystick->init();
     }
 }
@@ -266,7 +292,7 @@ gameport_init(const device_t *info)
 {
     gameport_t *p = NULL;
 
-    if (joystick_type == JOYSTICK_TYPE_NONE) {
+    if (!joystick_type) {
 	p = NULL;
 	return(p);
     }
@@ -285,7 +311,7 @@ gameport_201_init(const device_t *info)
 {
     gameport_t *p;
 
-    if (joystick_type == JOYSTICK_TYPE_NONE) {
+    if (!joystick_type) {
 	p = NULL;
 	return(p);
     }

src/include/86box/gameport.h

@@ -48,7 +48,6 @@
 #define SLIDER 			0x20000000
 
 #define AXIS_NOT_PRESENT	-99999
-#define JOYSTICK_TYPE_NONE 	8
 
 #define JOYSTICK_PRESENT(n)	(joystick_state[n].plat_joystick_nr != 0)
 
@@ -140,6 +139,8 @@ extern void	joystick_close(void);
 extern void	joystick_process(void);
 
 extern char	*joystick_get_name(int js);
+extern char	*joystick_get_internal_name(int js);
+extern int 	joystick_get_from_internal_name(char *s);
 extern int	joystick_get_max_joysticks(int js);
 extern int	joystick_get_axis_count(int js);
 extern int	joystick_get_button_count(int js);

src/include/86box/keyboard.h

@@ -68,9 +68,11 @@ extern const device_t	keyboard_tandy_device;
 #if defined(DEV_BRANCH) && defined(USE_LASERXT)
 extern const device_t	keyboard_xt_lxt3_device;
 #endif
+extern const device_t	keyboard_xt_olivetti_device;
 extern const device_t	keyboard_at_device;
 extern const device_t	keyboard_at_ami_device;
 extern const device_t	keyboard_at_toshiba_device;
+extern const device_t	keyboard_at_olivetti_device;
 extern const device_t	keyboard_ps2_device;
 extern const device_t	keyboard_ps2_ps1_device;
 extern const device_t	keyboard_ps2_ps1_pci_device;

src/include/86box/machine.h

@@ -509,8 +509,10 @@ extern int	machine_europc_init(const machine_t *);
 extern const device_t europc_device;
 #endif
 
-/* m_oivetti_m24.c */
+/* m_xt_olivetti.c */
-extern int	machine_olim24_init(const machine_t *);
+extern int	machine_xt_olim24_init(const machine_t *);
+extern int	machine_xt_olim240_init(const machine_t *);
+extern int	machine_xt_olim19_init(const machine_t *);
 #ifdef EMU_DEVICE_H
 extern const 	device_t *m24_get_device(void);
 #endif

src/include/86box/vid_ogc.h

@@ -0,0 +1,48 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Emulation of the Olivetti OGC 8-bit ISA (GO708) and 
+ *      M21/M24/M28 16-bit bus (GO317/318/380/709) video cards.
+ *
+ *
+ *
+ * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
+ *		Miran Grca, <mgrca8@gmail.com>
+ *		Fred N. van Kempen, <decwiz@yahoo.com>
+ *		EngiNerd, <webmaster.crrc@yahoo.it>
+ *
+ *		Copyright 2008-2019 Sarah Walker.
+ *		Copyright 2016-2019 Miran Grca.
+ *		Copyright 2017-2019 Fred N. van Kempen.
+ *		Copyright 2020 EngiNerd.
+ */
+
+typedef struct ogc_t {
+    cga_t cga;
+	/* unused in OGC, required for M19 video card structure idiom */
+    uint8_t	ctrl_3dd;
+    uint8_t	ctrl_3de;
+    uint32_t	base;
+    int		lineff;
+	int		mono_display;
+} ogc_t;
+
+void    ogc_recalctimings(ogc_t *ogc);
+void    ogc_out(uint16_t addr, uint8_t val, void *priv);
+uint8_t ogc_in(uint16_t addr, void *priv);
+void    ogc_write(uint32_t addr, uint8_t val, void *priv);
+uint8_t ogc_read(uint32_t addr, void *priv);
+void    ogc_poll(void *priv);
+void    ogc_close(void *priv);
+void    ogc_mdaattr_rebuild();
+
+
+#ifdef EMU_DEVICE_H
+extern const device_config_t ogc_config[];
+extern const device_t ogc_device;
+#endif

src/include/86box/video.h

@@ -241,6 +241,10 @@ extern const device_t gd5480_pci_device;
 extern const device_t compaq_cga_device;
 extern const device_t compaq_cga_2_device;
 
+/* Olivetti OGC */
+extern const device_t ogc_device;
+extern const device_t ogc_m24_device;
+
 /* Tseng ET4000AX */
 extern const device_t et4000_isa_device;
 extern const device_t et4000k_isa_device;

src/machine/m_amstrad.c

@@ -2507,7 +2507,7 @@ machine_amstrad_init(const machine_t *model, int type)
 	mouse_set_poll(ms_poll, ams);
     }
 
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	device_add(&gameport_device);
 }
 

src/machine/m_at.c

@@ -74,7 +74,7 @@ machine_at_common_init_ex(const machine_t *model, int type)
     else if (type == 0)
 	device_add(&at_nvr_device);
 
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	device_add(&gameport_device);
 }
 

src/machine/m_europc.c

@@ -615,7 +615,7 @@ europc_boot(const device_t *info)
 	mouse_bus_set_irq(sys->mouse, 2);
 	/* Configure the port for (Bus Mouse Compatible) Mouse. */
 	b |= 0x01;
-    } else if (joystick_type != JOYSTICK_TYPE_NONE)
+    } else if (joystick_type)
 	b |= 0x02;	/* enable port as joysticks */
     sys->nvr.regs[MRTC_CONF_C] = b;
 

src/machine/m_olivetti_m24.c

@@ -1,910 +0,0 @@
-/*
- * 86Box	A hypervisor and IBM PC system emulator that specializes in
- *		running old operating systems and software designed for IBM
- *		PC systems and compatibles from 1981 through fairly recent
- *		system designs based on the PCI bus.
- *
- *		This file is part of the 86Box distribution.
- *
- *		Emulation of the Olivetti M24.
- *
- *
- *
- * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
- *		Miran Grca, <mgrca8@gmail.com>
- *		Fred N. van Kempen, <decwiz@yahoo.com>
- *
- *		Copyright 2008-2019 Sarah Walker.
- *		Copyright 2016-2019 Miran Grca.
- *		Copyright 2017-2019 Fred N. van Kempen.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <wchar.h>
-#include <86box/86box.h>
-#include <86box/timer.h>
-#include <86box/io.h>
-#include <86box/pic.h>
-#include <86box/pit.h>
-#include <86box/ppi.h>
-#include <86box/nmi.h>
-#include <86box/mem.h>
-#include <86box/device.h>
-#include <86box/nvr.h>
-#include <86box/keyboard.h>
-#include <86box/mouse.h>
-#include <86box/rom.h>
-#include <86box/fdd.h>
-#include <86box/fdc.h>
-#include <86box/gameport.h>
-#include <86box/sound.h>
-#include <86box/snd_speaker.h>
-#include <86box/video.h>
-#include <86box/machine.h>
-
-
-#define STAT_PARITY     0x80
-#define STAT_RTIMEOUT   0x40
-#define STAT_TTIMEOUT   0x20
-#define STAT_LOCK       0x10
-#define STAT_CD         0x08
-#define STAT_SYSFLAG    0x04
-#define STAT_IFULL      0x02
-#define STAT_OFULL      0x01
-
-
-typedef struct {
-    /* Video stuff. */
-    mem_mapping_t mapping;
-    uint8_t	crtc[32];
-    int		crtcreg;
-	uint8_t monitor_type, port_23c6;
-    uint8_t	*vram;
-    uint8_t	charbuffer[256];
-    uint8_t	ctrl;
-    uint32_t	base;
-    uint8_t	cgamode, cgacol;
-    uint8_t	stat;
-    int		linepos, displine;
-    int		sc, vc;
-    int		con, coff, cursoron, blink;
-    int	vsynctime;
-    int		vadj;
-    int		lineff;
-    uint16_t	ma, maback;
-    int		dispon;
-    uint64_t	dispontime, dispofftime;
-    pc_timer_t	timer;
-    int		firstline, lastline;
-
-    /* Keyboard stuff. */
-    int		wantirq;
-    uint8_t	command;
-    uint8_t	status;
-    uint8_t	out;
-    uint8_t	output_port;
-    int		param,
-		param_total;
-    uint8_t	params[16];
-    uint8_t	scan[7];
-
-    /* Mouse stuff. */
-    int		mouse_mode;
-    int		x, y, b;
-	pc_timer_t send_delay_timer;
-} olim24_t;
-
-static video_timings_t timing_m24      = {VIDEO_ISA, 8,16,32, 8,16,32};
-
-
-static uint8_t crtcmask[32] = {
-    0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x7f, 0x7f,
-    0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-static uint8_t	key_queue[16];
-static int	key_queue_start = 0,
-		key_queue_end = 0;
-
-		
-		
-#ifdef ENABLE_M24VID_LOG
-int m24vid_do_log = ENABLE_M24VID_LOG;
-
-
-static void
-m24_log(const char *fmt, ...)
-{
-    va_list ap;
-
-    if (m24vid_do_log) {
-	va_start(ap, fmt);
-	vfprintf(stdlog, fmt, ap);
-	va_end(ap);
-	fflush(stdlog);
-    }
-}
-#else
-#define m24_log(fmt, ...)
-#endif
-
-
-static void
-recalc_timings(olim24_t *m24)
-{
-    double _dispontime, _dispofftime, disptime;
-
-    if (m24->cgamode & 1) {
-	disptime    = m24->crtc[0] + 1;
-	_dispontime = m24->crtc[1];
-    } else {
-	disptime    = (m24->crtc[0] + 1) << 1;
-	_dispontime = m24->crtc[1] << 1;
-    }
-
-    _dispofftime = disptime - _dispontime;
-    _dispontime  *= CGACONST / 2;
-    _dispofftime *= CGACONST / 2;
-    m24->dispontime  = (uint64_t)(_dispontime);
-    m24->dispofftime = (uint64_t)(_dispofftime);
-}
-
-
-static void
-vid_out(uint16_t addr, uint8_t val, void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-    uint8_t old;
-
-    switch (addr) {
-	case 0x3d4:
-		m24->crtcreg = val & 31;
-		break;
-
-	case 0x3d5:
-		old = m24->crtc[m24->crtcreg];
-		m24->crtc[m24->crtcreg] = val & crtcmask[m24->crtcreg];
-		if (old != val) {
-			if (m24->crtcreg < 0xe || m24->crtcreg > 0x10) {
-				fullchange = changeframecount;
-				recalc_timings(m24);
-			}
-		}
-		break;
-
-	case 0x3d8:
-		m24->cgamode = val;
-		break;
-
-	case 0x3d9:
-		m24->cgacol = val;
-		break;
-
-	case 0x3de:
-		m24->ctrl = val;
-		m24->base = (val & 0x08) ? 0x4000 : 0;
-		break;
-		
-	case 0x13c6:
-		m24->monitor_type = val;
-		break;
-		
-	case 0x23c6:
-		m24->port_23c6 = val;
-		break;
-    }
-}
-
-
-static uint8_t
-vid_in(uint16_t addr, void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-    uint8_t ret = 0xff;
-
-    switch (addr) {
-	case 0x3d4:
-		ret = m24->crtcreg;
-		break;
-
-	case 0x3d5:
-		ret = m24->crtc[m24->crtcreg];
-		break;
-
-	case 0x3da:
-		ret = m24->stat;
-		break;
-		
-	case 0x13c6:
-		ret = m24->monitor_type;
-		break;
-		
-	case 0x23c6:
-		ret = m24->port_23c6;
-		break;
-    }
-
-    return(ret);
-}
-
-
-static void
-vid_write(uint32_t addr, uint8_t val, void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-	int offset;
-
-    m24->vram[addr & 0x7FFF]=val;
-	offset = ((timer_get_remaining_u64(&m24->timer) / CGACONST) * 4) & 0xfc;
-	m24->charbuffer[offset] = m24->vram[addr & 0x7fff];
-	m24->charbuffer[offset | 1] = m24->vram[addr & 0x7fff];
-}
-
-
-static uint8_t
-vid_read(uint32_t addr, void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-
-    return(m24->vram[addr & 0x7FFF]);
-}
-
-
-static void
-vid_poll(void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-    uint16_t ca = (m24->crtc[15] | (m24->crtc[14] << 8)) & 0x3fff;
-    int drawcursor;
-    int x, c, xs_temp, ys_temp;
-    int oldvc;
-    uint8_t chr, attr;
-    uint16_t dat, dat2;
-    int cols[4];
-    int col;
-    int oldsc;
-
-    if (!m24->linepos) {
-	timer_advance_u64(&m24->timer, m24->dispofftime);
-	m24->stat |= 1;
-	m24->linepos = 1;
-	oldsc = m24->sc;
-	if ((m24->crtc[8] & 3) == 3) 
-		m24->sc = (m24->sc << 1) & 7;
-	if (m24->dispon) {
-		if (m24->displine < m24->firstline) {
-			m24->firstline = m24->displine;
-		}
-		m24->lastline = m24->displine;
-		for (c = 0; c < 8; c++) 
-		{
-			if ((m24->cgamode & 0x12) == 0x12) {
-				((uint32_t *)buffer32->line[m24->displine])[c] = 0;
-				if (m24->cgamode & 1)
-					((uint32_t *)buffer32->line[m24->displine])[c + (m24->crtc[1] << 3) + 8] = 0;
-				else
-					((uint32_t *)buffer32->line[m24->displine])[c + (m24->crtc[1] << 4) + 8] = 0;
-			} else {
-				((uint32_t *)buffer32->line[m24->displine])[c] = (m24->cgacol & 15) + 16;
-				if (m24->cgamode & 1)
-					((uint32_t *)buffer32->line[m24->displine])[c + (m24->crtc[1] << 3) + 8] = (m24->cgacol & 15) + 16;
-				else
-					((uint32_t *)buffer32->line[m24->displine])[c + (m24->crtc[1] << 4) + 8] = (m24->cgacol & 15) + 16;
-			}
-		}
-		if (m24->cgamode & 1) {
-			for (x = 0; x < m24->crtc[1]; x++) {
-				chr  = m24->charbuffer[ x << 1];
-				attr = m24->charbuffer[(x << 1) + 1];
-				drawcursor = ((m24->ma == ca) && m24->con && m24->cursoron);
-				if (m24->cgamode & 0x20) {
-					cols[1] = (attr & 15) + 16;
-					cols[0] = ((attr >> 4) & 7) + 16;
-					if ((m24->blink & 16) && (attr & 0x80) && !drawcursor) 
-						cols[1] = cols[0];
-				} else {
-					cols[1] = (attr & 15) + 16;
-					cols[0] = (attr >> 4) + 16;
-				}
-				if (drawcursor) {
-					for (c = 0; c < 8; c++)
-					    ((uint32_t *)buffer32->line[m24->displine])[(x << 3) + c + 8] = cols[(fontdatm[chr][((m24->sc & 7) << 1) | m24->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
-				} else {
-					for (c = 0; c < 8; c++)
-					    ((uint32_t *)buffer32->line[m24->displine])[(x << 3) + c + 8] = cols[(fontdatm[chr][((m24->sc & 7) << 1) | m24->lineff] & (1 << (c ^ 7))) ? 1 : 0];
-				}
-				m24->ma++;
-			}
-		} else if (!(m24->cgamode & 2)) {
-			for (x = 0; x < m24->crtc[1]; x++) {
-				chr  = m24->vram[((m24->ma << 1) & 0x3fff) + m24->base];
-				attr = m24->vram[(((m24->ma << 1) + 1) & 0x3fff) + m24->base];
-				drawcursor = ((m24->ma == ca) && m24->con && m24->cursoron);
-				if (m24->cgamode & 0x20) {
-					cols[1] = (attr & 15) + 16;
-					cols[0] = ((attr >> 4) & 7) + 16;
-					if ((m24->blink & 16) && (attr & 0x80)) 
-						cols[1] = cols[0];
-				} else {
-					cols[1] = (attr & 15) + 16;
-					cols[0] = (attr >> 4) + 16;
-				}
-				m24->ma++;
-				if (drawcursor) {
-					for (c = 0; c < 8; c++)
-					    ((uint32_t *)buffer32->line[m24->displine])[(x << 4) + (c << 1) + 8] = 
-					    ((uint32_t *)buffer32->line[m24->displine])[(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((m24->sc & 7) << 1) | m24->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
-				} else {
-					for (c = 0; c < 8; c++)
-					    ((uint32_t *)buffer32->line[m24->displine])[(x << 4) + (c << 1) + 8] = 
-					    ((uint32_t *)buffer32->line[m24->displine])[(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((m24->sc & 7) << 1) | m24->lineff] & (1 << (c ^ 7))) ? 1 : 0];
-				}
-			}
-		} else if (!(m24->cgamode & 16)) {
-			cols[0] = (m24->cgacol & 15) | 16;
-			col = (m24->cgacol & 16) ? 24 : 16;
-			if (m24->cgamode & 4) {
-					cols[1] = col | 3;
-					cols[2] = col | 4;
-					cols[3] = col | 7;
-			} else if (m24->cgacol & 32) {
-				cols[1] = col | 3;
-				cols[2] = col | 5;
-				cols[3] = col | 7;
-			} else {
-				cols[1] = col | 2;
-				cols[2] = col | 4;
-				cols[3] = col | 6;
-			}
-			for (x = 0; x < m24->crtc[1]; x++) {
-				dat = (m24->vram[((m24->ma << 1) & 0x1fff) + ((m24->sc & 1) * 0x2000) + m24->base] << 8) | 
-				       m24->vram[((m24->ma << 1) & 0x1fff) + ((m24->sc & 1) * 0x2000) + 1 + m24->base];
-				m24->ma++;
-				for (c = 0; c < 8; c++) {
-					((uint32_t *)buffer32->line[m24->displine])[(x << 4) + (c << 1) + 8] =
-					((uint32_t *)buffer32->line[m24->displine])[(x << 4) + (c << 1) + 1 + 8] = cols[dat >> 14];
-					dat <<= 2;
-				}
-			}
-		} else {
-			if (m24->ctrl & 1 || ((m24->monitor_type & 8) && (m24->port_23c6 & 1))) {
-				dat2 = ((m24->sc & 1) * 0x4000) | (m24->lineff * 0x2000);
-				cols[0] = 0; cols[1] = /*(m24->cgacol & 15)*/15 + 16;
-			} else {
-				dat2 = (m24->sc & 1) * 0x2000;
-				cols[0] = 0; cols[1] = (m24->cgacol & 15) + 16;
-			}
-			
-			for (x = 0; x < m24->crtc[1]; x++) {
-				dat = (m24->vram[((m24->ma << 1) & 0x1fff) + dat2] << 8) | m24->vram[((m24->ma << 1) & 0x1fff) + dat2 + 1];
-				m24->ma++;
-				for (c = 0; c < 16; c++) {
-					((uint32_t *)buffer32->line[m24->displine])[(x << 4) + c + 8] = cols[dat >> 15];
-					dat <<= 1;
-				}
-			}
-		}
-	} else {
-		cols[0] = ((m24->cgamode & 0x12) == 0x12) ? 0 : (m24->cgacol & 15) + 16;
-		if (m24->cgamode & 1)	hline(buffer32, 0, m24->displine, (m24->crtc[1] << 3) + 16, cols[0]);
-		else			hline(buffer32, 0, m24->displine, (m24->crtc[1] << 4) + 16, cols[0]);
-	}
-
-	if (m24->cgamode & 1)
-		x = (m24->crtc[1] << 3) + 16;
-	else
-		x = (m24->crtc[1] << 4) + 16;
-
-	m24->sc = oldsc;
-	if (m24->vc == m24->crtc[7] && !m24->sc)
-		m24->stat |= 8;
-	m24->displine++;
-	if (m24->displine >= 720) m24->displine = 0;
-    } else {
-	timer_advance_u64(&m24->timer, m24->dispontime);
-	if (m24->dispon) m24->stat &= ~1;
-	m24->linepos = 0;
-	m24->lineff ^= 1;
-	if (m24->lineff) {
-		m24->ma = m24->maback;
-	} else {
-		if (m24->vsynctime) {
-			m24->vsynctime--;
-			if (!m24->vsynctime)
-			   m24->stat &= ~8;
-		}
-		if (m24->sc == (m24->crtc[11] & 31) || ((m24->crtc[8] & 3) == 3 && m24->sc == ((m24->crtc[11] & 31) >> 1))) { 
-			m24->con = 0; 
-			m24->coff = 1; 
-		}
-		if (m24->vadj) {
-			m24->sc++;
-			m24->sc &= 31;
-			m24->ma = m24->maback;
-			m24->vadj--;
-			if (!m24->vadj) {
-				m24->dispon = 1;
-				m24->ma = m24->maback = (m24->crtc[13] | (m24->crtc[12] << 8)) & 0x3fff;
-				m24->sc = 0;
-			}
-		} else if (m24->sc == m24->crtc[9] || ((m24->crtc[8] & 3) == 3 && m24->sc == (m24->crtc[9] >> 1))) {
-			m24->maback = m24->ma;
-			m24->sc = 0;
-			oldvc = m24->vc;
-			m24->vc++;
-			m24->vc &= 127;
-
-			if (m24->vc == m24->crtc[6]) 
-				m24->dispon=0;
-
-			if (oldvc == m24->crtc[4]) {
-				m24->vc = 0;
-				m24->vadj = m24->crtc[5];
-				if (!m24->vadj) m24->dispon = 1;
-				if (!m24->vadj) m24->ma = m24->maback = (m24->crtc[13] | (m24->crtc[12] << 8)) & 0x3fff;
-				if ((m24->crtc[10] & 0x60) == 0x20)
-					m24->cursoron = 0;
-				else
-					m24->cursoron = m24->blink & 16;
-			}
-
-			if (m24->vc == m24->crtc[7]) {
-				m24->dispon = 0;
-				m24->displine = 0;
-				m24->vsynctime = (m24->crtc[3] >> 4) + 1;
-				if (m24->crtc[7]) {
-					if (m24->cgamode & 1)
-						x = (m24->crtc[1] << 3) + 16;
-					else
-						x = (m24->crtc[1] << 4) + 16;
-					m24->lastline++;
-
-					xs_temp = x;
-					ys_temp = (m24->lastline - m24->firstline);
-
-					if ((xs_temp > 0) && (ys_temp > 0)) {
-						if (xsize < 64) xs_temp = 656;
-						if (ysize < 32) ys_temp = 200;
-						if (!enable_overscan)
-							xs_temp -= 16;
-
-						if ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get()) {
-							xsize = xs_temp;
-							ysize = ys_temp;
-							set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
-
-							if (video_force_resize_get())
-								video_force_resize_set(0);
-						}
-
-						if (enable_overscan) {
-							video_blit_memtoscreen_8(0, m24->firstline - 8, 0, (m24->lastline - m24->firstline) + 16,
-										 xsize, (m24->lastline - m24->firstline) + 16);
-						} else
-							video_blit_memtoscreen_8(8, m24->firstline, 0, (m24->lastline - m24->firstline),
-										 xsize, (m24->lastline - m24->firstline));
-					}
-
-					frames++;
-
-					video_res_x = xsize;
-					video_res_y = ysize;
-					if (m24->cgamode & 1) {
-						video_res_x /= 8;
-						video_res_y /= (m24->crtc[9] + 1) * 2;
-						video_bpp = 0;
-					} else if (!(m24->cgamode & 2)) {
-						video_res_x /= 16;
-						video_res_y /= (m24->crtc[9] + 1) * 2;
-						video_bpp = 0;
-					} else if (!(m24->cgamode & 16)) {
-						video_res_x /= 2;
-						video_res_y /= 2;
-						video_bpp = 2;
-					} else if (!(m24->ctrl & 1)) {
-						video_res_y /= 2;
-						video_bpp = 1;
-					}
-				}
-				m24->firstline = 1000;
-				m24->lastline = 0;
-			m24->blink++;
-			}
-		} else {
-			m24->sc++;
-			m24->sc &= 31;
-			m24->ma = m24->maback;
-		}
-		if ((m24->sc == (m24->crtc[10] & 31) || ((m24->crtc[8] & 3) == 3 && m24->sc == ((m24->crtc[10] & 31) >> 1)))) 
-			m24->con = 1;
-	}
-	if (m24->dispon && (m24->cgamode & 1)) {
-		for (x = 0; x < (m24->crtc[1] << 1); x++)
-		    m24->charbuffer[x] = m24->vram[(((m24->ma << 1) + x) & 0x3fff) + m24->base];
-	}
-    }
-}
-
-
-static void
-speed_changed(void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-
-    recalc_timings(m24);
-}
-
-
-static void
-kbd_poll(void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-
-    timer_advance_u64(&m24->send_delay_timer, 1000 * TIMER_USEC);
-    if (m24->wantirq) {
-	m24->wantirq = 0;
-	picint(2);
-#if ENABLE_KEYBOARD_LOG
-	m24_log("M24: take IRQ\n");
-#endif
-    }
-
-    if (!(m24->status & STAT_OFULL) && key_queue_start != key_queue_end) {
-#if ENABLE_KEYBOARD_LOG
-	m24_log("Reading %02X from the key queue at %i\n",
-				m24->out, key_queue_start);
-#endif
-	m24->out = key_queue[key_queue_start];
-	key_queue_start = (key_queue_start + 1) & 0xf;
-	m24->status |=  STAT_OFULL;
-	m24->status &= ~STAT_IFULL;
-	m24->wantirq = 1;
-    }
-}
-
-
-static void
-kbd_adddata(uint16_t val)
-{
-    key_queue[key_queue_end] = val;
-    key_queue_end = (key_queue_end + 1) & 0xf;
-}
-
-
-static void
-kbd_adddata_ex(uint16_t val)
-{
-    kbd_adddata_process(val, kbd_adddata);
-}
-
-
-static void
-kbd_write(uint16_t port, uint8_t val, void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-
-#if ENABLE_KEYBOARD_LOG
-    m24_log("M24: write %04X %02X\n", port, val);
-#endif
-
-#if 0
-    if (ram[8] == 0xc3) {
-	output = 3;
-    }
-#endif
-    switch (port) {
-	case 0x60:
-		if (m24->param != m24->param_total) {
-			m24->params[m24->param++] = val;
-			if (m24->param == m24->param_total) {
-				switch (m24->command) {
-					case 0x11:
-						m24->mouse_mode = 0;
-						m24->scan[0] = m24->params[0];
-						m24->scan[1] = m24->params[1];
-						m24->scan[2] = m24->params[2];
-						m24->scan[3] = m24->params[3];
-						m24->scan[4] = m24->params[4];
-						m24->scan[5] = m24->params[5];
-						m24->scan[6] = m24->params[6];
-						break;
-
-					case 0x12:
-						m24->mouse_mode = 1;
-						m24->scan[0] = m24->params[0];
-						m24->scan[1] = m24->params[1];
-						m24->scan[2] = m24->params[2];
-						break;
-					
-					default:
-						m24_log("M24: bad keyboard command complete %02X\n", m24->command);
-				}
-			}
-		} else {
-			m24->command = val;
-			switch (val) {
-				case 0x01: /*Self-test*/
-					break;
-
-				case 0x05: /*Read ID*/
-					kbd_adddata(0x00);
-					break;
-
-				case 0x11:
-					m24->param = 0;
-					m24->param_total = 9;
-					break;
-
-				case 0x12:
-					m24->param = 0;
-					m24->param_total = 4;
-					break;
-
-				default:
-					m24_log("M24: bad keyboard command %02X\n", val);
-			}
-		}
-		break;
-
-	case 0x61:
-		ppi.pb = val;
-
-		speaker_update();
-		speaker_gated = val & 1;
-		speaker_enable = val & 2;
-		if (speaker_enable) 
-			was_speaker_enable = 1;
-		pit_ctr_set_gate(&pit->counters[2], val & 1);
-		break;
-    }
-}
-
-
-static uint8_t
-kbd_read(uint16_t port, void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-    uint8_t ret = 0xff;
-
-    switch (port) {
-	case 0x60:
-		ret = m24->out;
-		if (key_queue_start == key_queue_end) {
-			m24->status &= ~STAT_OFULL;
-			m24->wantirq = 0;
-		} else {
-			m24->out = key_queue[key_queue_start];
-			key_queue_start = (key_queue_start + 1) & 0xf;
-			m24->status |= STAT_OFULL;
-			m24->status &= ~STAT_IFULL;
-			m24->wantirq = 1;	
-		}
-		break;
-
-	case 0x61:
-		ret = ppi.pb;
-		break;
-
-	case 0x64:
-		ret = m24->status;
-		m24->status &= ~(STAT_RTIMEOUT | STAT_TTIMEOUT);
-		break;
-
-	default:
-		m24_log("\nBad M24 keyboard read %04X\n", port);
-    }
-
-    return(ret);
-}
-
-
-static int
-ms_poll(int x, int y, int z, int b, void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-
-    m24->x += x;
-    m24->y += y;
-
-    if (((key_queue_end - key_queue_start) & 0xf) > 14) return(0xff);
-
-    if ((b & 1) && !(m24->b & 1))
-	kbd_adddata(m24->scan[0]);
-    if (!(b & 1) && (m24->b & 1))
-	kbd_adddata(m24->scan[0] | 0x80);
-    m24->b = (m24->b & ~1) | (b & 1);
-
-    if (((key_queue_end - key_queue_start) & 0xf) > 14) return(0xff);
-
-    if ((b & 2) && !(m24->b & 2))
-	kbd_adddata(m24->scan[2]);
-    if (!(b & 2) && (m24->b & 2))
-	kbd_adddata(m24->scan[2] | 0x80);
-    m24->b = (m24->b & ~2) | (b & 2);
-
-    if (((key_queue_end - key_queue_start) & 0xf) > 14) return(0xff);
-
-    if ((b & 4) && !(m24->b & 4))
-	kbd_adddata(m24->scan[1]);
-    if (!(b & 4) && (m24->b & 4))
-	kbd_adddata(m24->scan[1] | 0x80);
-    m24->b = (m24->b & ~4) | (b & 4);
-
-    if (m24->mouse_mode) {
-	if (((key_queue_end - key_queue_start) & 0xf) > 12) return(0xff);
-
-	if (!m24->x && !m24->y) return(0xff);
-	
-	m24->y = -m24->y;
-
-	if (m24->x < -127) m24->x = -127;
-	if (m24->x >  127) m24->x =  127;
-	if (m24->x < -127) m24->x = 0x80 | ((-m24->x) & 0x7f);
-
-	if (m24->y < -127) m24->y = -127;
-	if (m24->y >  127) m24->y =  127;
-	if (m24->y < -127) m24->y = 0x80 | ((-m24->y) & 0x7f);
-
-	kbd_adddata(0xfe);
-	kbd_adddata(m24->x);
-	kbd_adddata(m24->y);
-
-	m24->x = m24->y = 0;
-    } else {
-	while (m24->x < -4) {
-		if (((key_queue_end - key_queue_start) & 0xf) > 14)
-							return(0xff);
-		m24->x += 4;
-		kbd_adddata(m24->scan[3]);
-	}
-	while (m24->x > 4) {
-		if (((key_queue_end - key_queue_start) & 0xf) > 14)
-							return(0xff);
-		m24->x -= 4;
-		kbd_adddata(m24->scan[4]);
-	}
-	while (m24->y < -4) {
-		if (((key_queue_end - key_queue_start) & 0xf) > 14)
-							return(0xff);
-		m24->y += 4;
-		kbd_adddata(m24->scan[5]);
-	}
-	while (m24->y > 4) {
-		if (((key_queue_end - key_queue_start) & 0xf) > 14)
-							return(0xff);
-		m24->y -= 4;
-		kbd_adddata(m24->scan[6]);
-	}
-    }
-
-    return(0);
-}
-
-
-static uint8_t
-m24_read(uint16_t port, void *priv)
-{
-    switch (port) {
-	case 0x66:
-		return 0x00;
-	case 0x67:
-		return 0x20 | 0x40 | 0x0C;
-    }
-
-    return(0xff);
-}
-
-static void
-vid_close(void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
-
-    free(m24->vram);
-
-    free(m24);
-}
-
-const device_t m24_device = {
-    "Olivetti M24",
-    0, 0,
-    NULL, vid_close, NULL,
-    { NULL },
-    speed_changed,
-    NULL,
-    NULL
-};
-
-const device_t *
-m24_get_device(void)
-{
-    return &m24_device;
-}
-
-
-static void
-kbd_reset(void *priv)
-{
-    olim24_t *m24 = (olim24_t *)priv;
- 
-    /* Initialize the keyboard. */
-    m24->status = STAT_LOCK | STAT_CD;
-    m24->wantirq = 0;
-    keyboard_scan = 1;
-    m24->param = m24->param_total = 0;
-    m24->mouse_mode = 0;
-    m24->scan[0] = 0x1c;
-    m24->scan[1] = 0x53;
-    m24->scan[2] = 0x01;
-    m24->scan[3] = 0x4b;
-    m24->scan[4] = 0x4d;
-    m24->scan[5] = 0x48;
-    m24->scan[6] = 0x50;   
-}
-
-
-int
-machine_olim24_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_interleaved(L"roms/machines/olivetti_m24/olivetti_m24_version_1.43_low.bin",
-				L"roms/machines/olivetti_m24/olivetti_m24_version_1.43_high.bin",
-				0x000fc000, 16384, 0);
-
-    if (bios_only || !ret)
-	return ret;
-
-    olim24_t *m24;
-
-    m24 = (olim24_t *)malloc(sizeof(olim24_t));
-    memset(m24, 0x00, sizeof(olim24_t));
-
-    machine_common_init(model);
-    device_add(&fdc_xt_device);
-
-    io_sethandler(0x0066, 2, m24_read, NULL, NULL, NULL, NULL, NULL, m24);
-
-    /* Initialize the video adapter. */
-    // loadfont(L"roms/machines/olivetti_m24/ATT-FONT-DUMPED-VERIFIED.BIN", 1);
-    loadfont(L"roms/machines/olivetti_m24/m24 graphics board go380 258 pqbq.bin", 1);
-    m24->vram = malloc(0x8000);
-    overscan_x = overscan_y = 16;
-    mem_mapping_add(&m24->mapping, 0xb8000, 0x08000,
-		    vid_read, NULL, NULL,
-		    vid_write, NULL, NULL,  NULL, 0, m24);
-    io_sethandler(0x03d0, 16, vid_in, NULL, NULL, vid_out, NULL, NULL, m24);
-    timer_add(&m24->timer, vid_poll, m24, 1);
-    device_add_ex(&m24_device, m24);
-    video_inform(VIDEO_FLAG_TYPE_CGA, &timing_m24);
-    cga_palette = 0;
-    cgapal_rebuild();
-
-    /* Initialize the keyboard. */
-    io_sethandler(0x0060, 2,
-		  kbd_read, NULL, NULL, kbd_write, NULL, NULL, m24);
-    io_sethandler(0x0064, 1,
-		  kbd_read, NULL, NULL, kbd_write, NULL, NULL, m24);
-    keyboard_send = kbd_adddata_ex;
-    kbd_reset(m24);
-    timer_add(&m24->send_delay_timer, kbd_poll, m24, 1);
-
-    /* Tell mouse driver about our internal mouse. */
-    mouse_reset();
-    mouse_set_poll(ms_poll, m24);
-
-    keyboard_set_table(scancode_xt);
-
-    if (joystick_type != JOYSTICK_TYPE_NONE)
-	device_add(&gameport_device);
-
-    /* FIXME: make sure this is correct?? */
-    device_add(&at_nvr_device);
-
-    nmi_init();
-
-    return ret;
-}

src/machine/m_ps1.c

@@ -517,7 +517,7 @@ ps1_common_init(const machine_t *model)
     device_add(&keyboard_ps2_ps1_device);
 
     /* Audio uses ports 200h and 202-207h, so only initialize gameport on 201h. */
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	device_add(&gameport_201_device);
 }
 

src/machine/m_tandy.c

@@ -1535,7 +1535,7 @@ machine_tandy1k_init(const machine_t *model, int type)
 		break;
     }
 
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	device_add(&gameport_device);
 
     eep_data_out = 0x0000;

src/machine/m_xt.c

@@ -29,7 +29,7 @@ machine_xt_common_init(const machine_t *model)
 	device_add(&fdc_xt_device);
     
     nmi_init();
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	device_add(&gameport_device);
 }
 

src/machine/m_xt_compaq.c

@@ -56,7 +56,7 @@ machine_xt_compaq_deskpro_init(const machine_t *model)
     if (fdc_type == FDC_INTERNAL)
 	device_add(&fdc_xt_device);
     nmi_init();
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	device_add(&gameport_device);
 
     lpt1_remove();
@@ -85,7 +85,7 @@ machine_xt_compaq_portable_init(const machine_t *model)
     if (fdc_type == FDC_INTERNAL)
 	device_add(&fdc_xt_device);
     nmi_init();
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	device_add(&gameport_device);
 
     lpt1_remove();

src/machine/m_xt_laserxt.c

@@ -171,7 +171,7 @@ machine_xt_lxt3_init(const machine_t *model)
     device_add(&keyboard_xt_lxt3_device);
     device_add(&fdc_xt_device);
     nmi_init();
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	device_add(&gameport_device);
 
     laserxt_init(1);

src/machine/m_xt_olivetti.c

@@ -0,0 +1,842 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Emulation of the Olivetti XT-compatible machines.
+ *
+ *
+ *
+ * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
+ *		Miran Grca, <mgrca8@gmail.com>
+ *		Fred N. van Kempen, <decwiz@yahoo.com>
+ *      EngiNerd <webmaster.crrc@yahoo.it>
+ *
+ *		Copyright 2008-2019 Sarah Walker.
+ *		Copyright 2016-2019 Miran Grca.
+ *		Copyright 2017-2019 Fred N. van Kempen.
+ *		Copyright 2020 EngiNerd.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <wchar.h>
+#include <86box/86box.h>
+#include <86box/timer.h>
+#include <86box/io.h>
+#include <86box/pic.h>
+#include <86box/pit.h>
+#include <86box/ppi.h>
+#include <86box/nmi.h>
+#include <86box/mem.h>
+#include <86box/device.h>
+#include <86box/nvr.h>
+#include <86box/keyboard.h>
+#include <86box/mouse.h>
+#include <86box/rom.h>
+#include <86box/fdd.h>
+#include <86box/fdc.h>
+#include <86box/fdc_ext.h>
+#include <86box/gameport.h>
+#include <86box/sound.h>
+#include <86box/snd_speaker.h>
+#include <86box/video.h>
+#include <86box/machine.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_ogc.h>
+#include <86box/vid_colorplus.h>
+#include <86box/vid_cga_comp.h>
+
+#define STAT_PARITY     0x80
+#define STAT_RTIMEOUT   0x40
+#define STAT_TTIMEOUT   0x20
+#define STAT_LOCK       0x10
+#define STAT_CD         0x08
+#define STAT_SYSFLAG    0x04
+#define STAT_IFULL      0x02
+#define STAT_OFULL      0x01
+
+#define PLANTRONICS_MODE 1
+#define OLIVETTI_OGC_MODE 0
+
+#define CGA_RGB 0
+#define CGA_COMPOSITE 1
+
+typedef struct {
+    /* Keyboard stuff. */
+    int		wantirq;
+    uint8_t	command;
+    uint8_t	status;
+    uint8_t	out;
+    uint8_t	output_port;
+    int		param,
+		param_total;
+    uint8_t	params[16];
+    uint8_t	scan[7];
+
+    /* Mouse stuff. */
+    int		mouse_mode;
+    int		x, y, b;
+	pc_timer_t send_delay_timer;
+} olim24_kbd_t;
+
+typedef struct {
+	ogc_t ogc;
+	colorplus_t colorplus;
+	int mode;
+} olim19_vid_t;
+
+static uint8_t	key_queue[16];
+static int	key_queue_start = 0,
+		key_queue_end = 0;
+
+video_timings_t timing_m19_vid = {VIDEO_ISA, 8, 16, 32,   8, 16, 32};
+
+#ifdef ENABLE_M24VID_LOG
+int m24vid_do_log = ENABLE_M24VID_LOG;
+
+
+static void
+m24_log(const char *fmt, ...)
+{
+    va_list ap;
+
+    if (m24vid_do_log) {
+	va_start(ap, fmt);
+	vfprintf(stdlog, fmt, ap);
+	va_end(ap);
+	fflush(stdlog);
+    }
+}
+#else
+#define m24_log(fmt, ...)
+#endif
+
+static void
+m24_kbd_poll(void *priv)
+{
+    olim24_kbd_t *m24_kbd = (olim24_kbd_t *)priv;
+
+    timer_advance_u64(&m24_kbd->send_delay_timer, 1000 * TIMER_USEC);
+    if (m24_kbd->wantirq) {
+	m24_kbd->wantirq = 0;
+	picint(2);
+#if ENABLE_KEYBOARD_LOG
+	m24_log("M24: take IRQ\n");
+#endif
+    }
+
+    if (!(m24_kbd->status & STAT_OFULL) && key_queue_start != key_queue_end) {
+#if ENABLE_KEYBOARD_LOG
+	m24_log("Reading %02X from the key queue at %i\n",
+				m24_kbd->out, key_queue_start);
+#endif
+	m24_kbd->out = key_queue[key_queue_start];
+	key_queue_start = (key_queue_start + 1) & 0xf;
+	m24_kbd->status |=  STAT_OFULL;
+	m24_kbd->status &= ~STAT_IFULL;
+	m24_kbd->wantirq = 1;
+    }
+}
+
+
+static void
+m24_kbd_adddata(uint16_t val)
+{
+    key_queue[key_queue_end] = val;
+    key_queue_end = (key_queue_end + 1) & 0xf;
+}
+
+
+static void
+m24_kbd_adddata_ex(uint16_t val)
+{
+    kbd_adddata_process(val, m24_kbd_adddata);
+}
+
+
+static void
+m24_kbd_write(uint16_t port, uint8_t val, void *priv)
+{
+    olim24_kbd_t *m24_kbd = (olim24_kbd_t *)priv;
+
+#if ENABLE_KEYBOARD_LOG
+    m24_log("M24: write %04X %02X\n", port, val);
+#endif
+
+#if 0
+    if (ram[8] == 0xc3) {
+	output = 3;
+    }
+#endif
+    switch (port) {
+	case 0x60:
+		if (m24_kbd->param != m24_kbd->param_total) {
+			m24_kbd->params[m24_kbd->param++] = val;
+			if (m24_kbd->param == m24_kbd->param_total) {
+				switch (m24_kbd->command) {
+					case 0x11:
+						m24_kbd->mouse_mode = 0;
+						m24_kbd->scan[0] = m24_kbd->params[0];
+						m24_kbd->scan[1] = m24_kbd->params[1];
+						m24_kbd->scan[2] = m24_kbd->params[2];
+						m24_kbd->scan[3] = m24_kbd->params[3];
+						m24_kbd->scan[4] = m24_kbd->params[4];
+						m24_kbd->scan[5] = m24_kbd->params[5];
+						m24_kbd->scan[6] = m24_kbd->params[6];
+						break;
+
+					case 0x12:
+						m24_kbd->mouse_mode = 1;
+						m24_kbd->scan[0] = m24_kbd->params[0];
+						m24_kbd->scan[1] = m24_kbd->params[1];
+						m24_kbd->scan[2] = m24_kbd->params[2];
+						break;
+					
+					default:
+						m24_log("M24: bad keyboard command complete %02X\n", m24_kbd->command);
+				}
+			}
+		} else {
+			m24_kbd->command = val;
+			switch (val) {
+				case 0x01: /*Self-test*/
+					break;
+
+				case 0x05: /*Read ID*/
+					m24_kbd_adddata(0x00);
+					break;
+
+				case 0x11:
+					m24_kbd->param = 0;
+					m24_kbd->param_total = 9;
+					break;
+
+				case 0x12:
+					m24_kbd->param = 0;
+					m24_kbd->param_total = 4;
+					break;
+
+				default:
+					m24_log("M24: bad keyboard command %02X\n", val);
+			}
+		}
+		break;
+
+	case 0x61:
+		ppi.pb = val;
+
+		speaker_update();
+		speaker_gated = val & 1;
+		speaker_enable = val & 2;
+		if (speaker_enable) 
+			was_speaker_enable = 1;
+		pit_ctr_set_gate(&pit->counters[2], val & 1);
+		break;
+    }
+}
+
+static uint8_t
+m24_kbd_read(uint16_t port, void *priv)
+{
+    olim24_kbd_t *m24_kbd = (olim24_kbd_t *)priv;
+    uint8_t ret = 0xff;
+
+    switch (port) {
+	case 0x60:
+		ret = m24_kbd->out;
+		if (key_queue_start == key_queue_end) {
+			m24_kbd->status &= ~STAT_OFULL;
+			m24_kbd->wantirq = 0;
+		} else {
+			m24_kbd->out = key_queue[key_queue_start];
+			key_queue_start = (key_queue_start + 1) & 0xf;
+			m24_kbd->status |= STAT_OFULL;
+			m24_kbd->status &= ~STAT_IFULL;
+			m24_kbd->wantirq = 1;	
+		}
+		break;
+
+	case 0x61:
+		ret = ppi.pb;
+		break;
+
+	case 0x64:
+		ret = m24_kbd->status;
+		m24_kbd->status &= ~(STAT_RTIMEOUT | STAT_TTIMEOUT);
+		break;
+
+	default:
+		m24_log("\nBad M24 keyboard read %04X\n", port);
+    }
+
+    return(ret);
+}
+
+static void
+m24_kbd_close(void *priv)
+{
+	olim24_kbd_t *kbd = (olim24_kbd_t *)priv;
+	/* Stop the timer. */
+    timer_disable(&kbd->send_delay_timer);
+ 
+    /* Disable scanning. */
+    keyboard_scan = 0;
+
+    keyboard_send = NULL;
+
+    io_removehandler(0x0060, 2,
+		     m24_kbd_read, NULL, NULL, m24_kbd_write, NULL, NULL, kbd);
+	io_removehandler(0x0064, 1,
+		     m24_kbd_read, NULL, NULL, m24_kbd_write, NULL, NULL, kbd);
+
+    free(kbd);
+}
+
+static void
+m24_kbd_reset(void *priv)
+{
+    olim24_kbd_t *m24_kbd = (olim24_kbd_t *)priv;
+ 
+    /* Initialize the keyboard. */
+    m24_kbd->status = STAT_LOCK | STAT_CD;
+    m24_kbd->wantirq = 0;
+    keyboard_scan = 1;
+    m24_kbd->param = m24_kbd->param_total = 0;
+    m24_kbd->mouse_mode = 0;
+    m24_kbd->scan[0] = 0x1c;
+    m24_kbd->scan[1] = 0x53;
+    m24_kbd->scan[2] = 0x01;
+    m24_kbd->scan[3] = 0x4b;
+    m24_kbd->scan[4] = 0x4d;
+    m24_kbd->scan[5] = 0x48;
+    m24_kbd->scan[6] = 0x50;   
+}
+
+static int
+ms_poll(int x, int y, int z, int b, void *priv)
+{
+    olim24_kbd_t *m24_kbd = (olim24_kbd_t *)priv;
+
+    m24_kbd->x += x;
+    m24_kbd->y += y;
+
+    if (((key_queue_end - key_queue_start) & 0xf) > 14) return(0xff);
+
+    if ((b & 1) && !(m24_kbd->b & 1))
+	m24_kbd_adddata(m24_kbd->scan[0]);
+    if (!(b & 1) && (m24_kbd->b & 1))
+	m24_kbd_adddata(m24_kbd->scan[0] | 0x80);
+    m24_kbd->b = (m24_kbd->b & ~1) | (b & 1);
+
+    if (((key_queue_end - key_queue_start) & 0xf) > 14) return(0xff);
+
+    if ((b & 2) && !(m24_kbd->b & 2))
+	m24_kbd_adddata(m24_kbd->scan[2]);
+    if (!(b & 2) && (m24_kbd->b & 2))
+	m24_kbd_adddata(m24_kbd->scan[2] | 0x80);
+    m24_kbd->b = (m24_kbd->b & ~2) | (b & 2);
+
+    if (((key_queue_end - key_queue_start) & 0xf) > 14) return(0xff);
+
+    if ((b & 4) && !(m24_kbd->b & 4))
+	m24_kbd_adddata(m24_kbd->scan[1]);
+    if (!(b & 4) && (m24_kbd->b & 4))
+	m24_kbd_adddata(m24_kbd->scan[1] | 0x80);
+    m24_kbd->b = (m24_kbd->b & ~4) | (b & 4);
+
+    if (m24_kbd->mouse_mode) {
+	if (((key_queue_end - key_queue_start) & 0xf) > 12) return(0xff);
+
+	if (!m24_kbd->x && !m24_kbd->y) return(0xff);
+	
+	m24_kbd->y = -m24_kbd->y;
+
+	if (m24_kbd->x < -127) m24_kbd->x = -127;
+	if (m24_kbd->x >  127) m24_kbd->x =  127;
+	if (m24_kbd->x < -127) m24_kbd->x = 0x80 | ((-m24_kbd->x) & 0x7f);
+
+	if (m24_kbd->y < -127) m24_kbd->y = -127;
+	if (m24_kbd->y >  127) m24_kbd->y =  127;
+	if (m24_kbd->y < -127) m24_kbd->y = 0x80 | ((-m24_kbd->y) & 0x7f);
+
+	m24_kbd_adddata(0xfe);
+	m24_kbd_adddata(m24_kbd->x);
+	m24_kbd_adddata(m24_kbd->y);
+
+	m24_kbd->x = m24_kbd->y = 0;
+    } else {
+	while (m24_kbd->x < -4) {
+		if (((key_queue_end - key_queue_start) & 0xf) > 14)
+							return(0xff);
+		m24_kbd->x += 4;
+		m24_kbd_adddata(m24_kbd->scan[3]);
+	}
+	while (m24_kbd->x > 4) {
+		if (((key_queue_end - key_queue_start) & 0xf) > 14)
+							return(0xff);
+		m24_kbd->x -= 4;
+		m24_kbd_adddata(m24_kbd->scan[4]);
+	}
+	while (m24_kbd->y < -4) {
+		if (((key_queue_end - key_queue_start) & 0xf) > 14)
+							return(0xff);
+		m24_kbd->y += 4;
+		m24_kbd_adddata(m24_kbd->scan[5]);
+	}
+	while (m24_kbd->y > 4) {
+		if (((key_queue_end - key_queue_start) & 0xf) > 14)
+							return(0xff);
+		m24_kbd->y -= 4;
+		m24_kbd_adddata(m24_kbd->scan[6]);
+	}
+    }
+
+    return(0);
+}
+
+static void
+m24_kbd_init(olim24_kbd_t *kbd){
+	
+	/* Initialize the keyboard. */
+    io_sethandler(0x0060, 2,
+		  m24_kbd_read, NULL, NULL, m24_kbd_write, NULL, NULL, kbd);
+    io_sethandler(0x0064, 1,
+		  m24_kbd_read, NULL, NULL, m24_kbd_write, NULL, NULL, kbd);
+    keyboard_send = m24_kbd_adddata_ex;
+    m24_kbd_reset(kbd);
+    timer_add(&kbd->send_delay_timer, m24_kbd_poll, kbd, 1);
+
+    /* Tell mouse driver about our internal mouse. */
+    mouse_reset();
+    mouse_set_poll(ms_poll, kbd);
+
+    keyboard_set_table(scancode_xt);
+
+}
+
+static void
+m19_vid_out(uint16_t addr, uint8_t val, void *priv)
+{
+	olim19_vid_t *vid = (olim19_vid_t *)priv;
+	int oldmode = vid->mode;
+	
+	/* activating plantronics mode */
+	if (addr == 0x3dd){	
+		/* already in graphics mode */
+		if ((val & 0x30) && (vid->ogc.cga.cgamode & 0x2)) {
+			vid->mode = PLANTRONICS_MODE;
+		} else { 
+			vid->mode = OLIVETTI_OGC_MODE;
+}
+	/* setting graphics mode */
+	} else if (addr == 0x3d8) {
+		if ((val & 0x2) && (vid->colorplus.control & 0x30)){
+			vid->mode = PLANTRONICS_MODE;
+		} else {
+			vid->mode = OLIVETTI_OGC_MODE;
+		}
+	}
+	/* video mode changed */
+	if(oldmode != vid->mode){
+		/* activate Plantronics emulation */
+		if (vid->mode == PLANTRONICS_MODE){
+			timer_disable(&vid->ogc.cga.timer);
+			timer_set_delay_u64(&vid->colorplus.cga.timer, 0);
+		/* return to OGC mode */
+		} else {
+			timer_disable(&vid->colorplus.cga.timer);
+			timer_set_delay_u64(&vid->ogc.cga.timer, 0);
+		}
+		colorplus_recalctimings(&vid->colorplus);
+		ogc_recalctimings(&vid->ogc);
+	}
+	colorplus_out(addr, val, &vid->colorplus);
+	ogc_out(addr, val, &vid->ogc);
+}
+
+static uint8_t
+m19_vid_in(uint16_t addr, void *priv)
+{
+	olim19_vid_t *vid = (olim19_vid_t *)priv;
+	if ( vid->mode == PLANTRONICS_MODE ) {
+		return colorplus_in(addr, &vid->colorplus);
+	} else {
+		return ogc_in(addr, &vid->ogc);
+}
+
+}
+
+static uint8_t
+m19_vid_read(uint32_t addr, void *priv)
+{
+	olim19_vid_t *vid = (olim19_vid_t *)priv;
+	vid->colorplus.cga.mapping = vid->ogc.cga.mapping;
+	if ( vid->mode == PLANTRONICS_MODE ) {
+		return colorplus_read(addr, &vid->colorplus);
+	} else {
+		return ogc_read(addr, &vid->ogc);
+}
+}
+
+static void
+m19_vid_write(uint32_t addr, uint8_t val, void *priv)
+{
+	olim19_vid_t *vid = (olim19_vid_t *)priv;
+	colorplus_write(addr, val, &vid->colorplus);
+	ogc_write(addr, val, &vid->ogc);
+}
+
+
+static void
+m19_vid_close(void *priv)
+{
+	olim19_vid_t *vid = (olim19_vid_t *)priv;
+	free(vid->ogc.cga.vram);
+    free(vid->colorplus.cga.vram);
+	free(vid);
+}
+
+static void
+m19_vid_speed_changed(void *priv)
+{
+	olim19_vid_t *vid = (olim19_vid_t *)priv;
+	colorplus_recalctimings(&vid->colorplus);
+	ogc_recalctimings(&vid->ogc);
+}
+
+static void
+m19_vid_init(olim19_vid_t *vid){
+
+	//int display_type;
+	vid->mode = OLIVETTI_OGC_MODE;
+
+	video_inform(VIDEO_FLAG_TYPE_CGA, &timing_m19_vid);
+
+	//display_type = device_get_config_int("display_type");
+    
+	/* OGC emulation part begin */
+	loadfont(L"roms/machines/olivetti_m19/BIOS.BIN", 10);
+	/* composite is not working yet */
+	vid->ogc.cga.composite = 0; // (display_type != CGA_RGB);
+    //vid->ogc.cga.snow_enabled = device_get_config_int("snow_enabled");
+	
+	vid->ogc.cga.vram = malloc(0x8000);
+
+	//cga_comp_init(vid->ogc.cga.revision);
+    
+	//vid->ogc.cga.rgb_type = device_get_config_int("rgb_type");
+    //cga_palette = (vid->ogc.cga.rgb_type << 1);
+    cga_palette = 0;
+	cgapal_rebuild();
+	ogc_mdaattr_rebuild();
+
+	/* color display */
+	// if (device_get_config_int("rgb_type")==0 || device_get_config_int("rgb_type") == 4) 
+	vid->ogc.mono_display = 1;
+	// else
+	// 	vid->ogc.mono_display = 1;    
+	/* OGC emulation part end */
+	
+	/* Plantronics emulation part begin*/
+	/* composite is not working yet */
+	vid->colorplus.cga.composite = 0; //(display_type != CGA_RGB);
+    // vid->colorplus.cga.snow_enabled = device_get_config_int("snow_enabled");
+
+    vid->colorplus.cga.vram = malloc(0x8000);
+                
+	//vid->colorplus.cga.cgamode = 0x1;
+	/* Plantronics emulation part end*/
+
+	timer_add(&vid->ogc.cga.timer, ogc_poll, &vid->ogc, 1);
+	timer_add(&vid->colorplus.cga.timer, colorplus_poll, &vid->colorplus, 1);
+	timer_disable(&vid->colorplus.cga.timer);
+	mem_mapping_add(&vid->ogc.cga.mapping, 0xb8000, 0x08000, m19_vid_read, NULL, NULL, m19_vid_write, NULL, NULL,  NULL, MEM_MAPPING_EXTERNAL, vid);
+	io_sethandler(0x03d0, 0x0010, m19_vid_in, NULL, NULL, m19_vid_out, NULL, NULL, vid);
+	
+	vid->mode = OLIVETTI_OGC_MODE;
+	
+}
+
+const device_t m24_kbd_device = {
+    "Olivetti M24 keyboard and mouse",
+    0,
+    0,
+    NULL,
+    m24_kbd_close,
+    m24_kbd_reset,
+    { NULL }, NULL, NULL
+};
+
+const device_t m19_vid_device = {
+    "Olivetti M19 graphics card",
+    0, 0,
+    NULL, m19_vid_close, NULL,
+    { NULL },
+    m19_vid_speed_changed,
+    NULL,
+    NULL
+};
+
+const device_t *
+m19_get_device(void)
+{
+    return &m19_vid_device;
+}
+
+static uint8_t
+m24_read(uint16_t port, void *priv)
+{
+	uint8_t ret = 0x00;
+	int i, fdd_count = 0; 
+    switch (port) {
+	/* 
+	 * port 66:
+	 * DIPSW-0 on mainboard (off=present=1)
+	 * bit 7 - 2764 (off) / 2732 (on) ROM (BIOS < 1.36)
+	 * bit 7 - Use (off) / do not use (on) memory bank 1 (BIOS >= 1.36)
+	 * bit 6 - n/a
+	 * bit 5 - 8530 (off) / 8250 (on) SCC
+	 * bit 4 - 8087 present
+	 * bits 3-0 - installed memory
+	 */
+	case 0x66:
+		/* Switch 5 - 8087 present */
+		if (hasfpu)
+			ret |= 0x10;
+	/* 
+		 * Switches 1, 2, 3, 4 - installed memory 
+		 * Switch 8 - Use memory bank 1
+		 */
+		switch (mem_size) {
+			case 128:
+				ret |= 0x1;
+				break;
+			case 256:
+				ret |= 0x2|0x80;
+				break;
+			case 384:
+				ret |= 0x1|0x2|0x80;
+				break;
+			case 512:
+				ret |= 0x8;
+				break;
+			case 640:
+			default:
+				ret |= 0x1|0x8|0x80;
+				break;
+        }
+	/* 
+	 * port 67:
+	 * DIPSW-1 on mainboard (off=present=1)
+	 * bits 7-6 - number of drives
+	 * bits 5-4 - display adapter
+	 * bit 3 - video scroll CPU (on) / slow scroll (off)
+	 * bit 2 - BIOS HD on mainboard (on) / on controller (off)
+	 * bit 1 - FDD fast (off) / slow (on) start drive
+	 * bit 0 - 96 TPI (720 KB 3.5") (off) / 48 TPI (360 KB 5.25") FDD drive
+	 * 
+	 * Display adapter:
+	 * off off 80x25 mono
+	 * off on  40x25 color
+	 * on off  80x25 color
+	 * on on   EGA/VGA (works only for BIOS ROM 1.43)
+	 */
+	case 0x67:
+		for (i = 0; i < FDD_NUM; i++) {
+            if (fdd_get_flags(i)) {
+				fdd_count++;
+		}
+    }
+
+		/* Switches 7, 8 - floppy drives. */
+		if (!fdd_count)
+			ret |= 0x00;
+		else
+			ret |= ((fdd_count - 1) << 6);
+        
+		/* Switches 5, 6 - monitor type */
+		if (video_is_mda())
+			ret |= 0x30;
+		else if (video_is_cga())
+			ret |= 0x20;	/* 0x10 would be 40x25 */
+		else
+			ret |= 0x0;
+		
+		/* Switch 3 - Disable internal BIOS HD */
+		ret |= 0x4;
+		
+		/* Switch 2 - Set fast startup */
+		ret |= 0x2;
+}
+
+    return(ret);
+}
+
+const device_t *
+m24_get_device(void)
+{
+    return &ogc_m24_device;
+}
+
+int
+machine_xt_olim24_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved(L"roms/machines/olivetti_m24/olivetti_m24_version_1.43_low.bin",
+				L"roms/machines/olivetti_m24/olivetti_m24_version_1.43_high.bin",
+				0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+		return ret;
+
+	if (gfxcard == VID_INTERNAL)
+    	device_add(&ogc_m24_device);
+
+	olim24_kbd_t *m24_kbd;
+
+    m24_kbd = (olim24_kbd_t *)malloc(sizeof(olim24_kbd_t));
+    memset(m24_kbd, 0x00, sizeof(olim24_kbd_t));
+
+    machine_common_init(model);
+    device_add(&fdc_xt_device);
+
+	//address 66-67 = mainboard dip-switch settings
+	io_sethandler(0x0066, 2, m24_read, NULL, NULL, NULL, NULL, NULL, NULL);
+
+	m24_kbd_init(m24_kbd);
+	device_add_ex(&m24_kbd_device, m24_kbd);
+
+	/* FIXME: make sure this is correct?? */
+    device_add(&at_nvr_device);
+
+    if (joystick_type)
+		device_add(&gameport_device);
+
+    nmi_init();
+
+    
+	return ret;
+}
+
+/*
+ * Current bugs: 
+ * - handles only 360kb floppy drives (drive type and capacity selectable with jumpers mapped to unknown memory locations)
+ */
+int
+machine_xt_olim240_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved(L"roms/machines/olivetti_m240/olivetti_m240_pch6_2.04_low.bin",
+				L"roms/machines/olivetti_m240/olivetti_m240_pch5_2.04_high.bin",
+				0x000f8000, 32768, 0);
+
+    if (bios_only || !ret)
+		return ret;
+
+	machine_common_init(model);
+
+	pit_ctr_set_out_func(&pit->counters[1], pit_refresh_timer_xt);
+
+	/* 
+	 * port 60: should return jumper settings only under unknown conditions
+	 * SWB on mainboard (off=1)
+	 * bit 7 - use BIOS HD on mainboard (on) / on controller (off)
+     * bit 6 - use OCG/CGA display adapter (on) / other display adapter (off)
+     */
+    device_add(&keyboard_at_olivetti_device);
+
+    /* FIXME: make sure this is correct?? */
+    device_add(&at_nvr_device);
+
+	if (fdc_type == FDC_INTERNAL)	
+		device_add(&fdc_xt_device);
+
+	if (joystick_type)
+		device_add(&gameport_device);
+
+    nmi_init();
+
+    return ret;
+}
+
+
+/*
+ * Current bugs: 
+ * - 640x400x2 graphics mode not supported (bit 0 of register 0x3de cannot be set)
+ * - optional mouse emulation missing
+ */
+int
+machine_xt_olim19_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear(L"roms/machines/olivetti_m19/BIOS.BIN",
+			   0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+	return ret;
+
+    olim19_vid_t *vid;
+
+	/* do not move memory allocation elsewhere */
+	vid = (olim19_vid_t *)malloc(sizeof(olim19_vid_t));
+	memset(vid, 0x00, sizeof(olim19_vid_t));
+	
+    machine_common_init(model);
+    device_add(&fdc_xt_device);
+
+	m19_vid_init(vid);
+	device_add_ex(&m19_vid_device, vid);
+
+	device_add(&keyboard_xt_olivetti_device);
+	
+	nmi_init();
+
+    return ret;
+
+}
+
+
+/* not working, returns timer error */
+/* it appears to be a rebadged Hitachi HL 320 laptop */
+int
+machine_xt_olim15_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear(L"roms/machines/olivetti_m15/oliv_m15.bin",
+			   0x000fc000, 16384, 0);
+
+    if (bios_only || !ret)
+    return ret;
+
+	machine_common_init(model);
+
+	pit_ctr_set_out_func(&pit->counters[1], pit_refresh_timer_xt);
+
+	device_add(&keyboard_xt_olivetti_device);
+	
+	device_add(&cga_device);
+	
+    /* FIXME: make sure this is correct?? */
+    //device_add(&at_nvr_device);
+
+	if (fdc_type == FDC_INTERNAL)	
+		device_add(&fdc_xt_device);
+
+	if (joystick_type)
+		device_add(&gameport_device);
+
+    nmi_init();
+
+    return ret;
+}

src/machine/m_xt_xi8088.c

@@ -177,7 +177,7 @@ machine_xt_xi8088_init(const machine_t *model)
     nmi_init();
     device_add(&ibmat_nvr_device);
     pic2_init();
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	device_add(&gameport_device);
 
     return ret;

src/machine/machine_table.c

@@ -79,19 +79,22 @@ const machine_t machines[] = {
     { "[8088] Xi8088",				"xi8088",		MACHINE_TYPE_8088,		CPU_PKG_8088, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2,							   64,  1024, 128,  127,	       machine_xt_xi8088_init, xi8088_get_device	},
     { "[8088] Zenith Data SupersPort",		"zdsupers",		MACHINE_TYPE_8088,		CPU_PKG_8088, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC,									  128,   640, 128,    0,	       machine_xt_zenith_init, NULL			},
     
+    { "[8088] Olivetti M19",		"olivetti_m19",			MACHINE_TYPE_8088,		CPU_PKG_8088, 0, 0, 0, 0, 0, 0, 0,                               MACHINE_PC | MACHINE_VIDEO_FIXED,					 256,  640,  256,   0,		 machine_xt_olim19_init, NULL			},
     /* 8086 Machines */
     { "[8086] Amstrad PC1512",			"pc1512",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 8000000, 8000000, 0, 0, 0, 0,									MACHINE_PC | MACHINE_VIDEO_FIXED | MACHINE_MOUSE,				  512,   640, 128,   63,		  machine_pc1512_init, pc1512_get_device	},
-    { "[8086] Amstrad PC1640",			"pc1640",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO | MACHINE_MOUSE,					640,  640,   0,  63,		  machine_pc1640_init, pc1640_get_device	},
+    { "[8086] Amstrad PC1640",			"pc1640",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO | MACHINE_MOUSE,					  640,   640, 640,   63,		  machine_pc1640_init, pc1640_get_device	},
-    { "[8086] Amstrad PC2086",			"pc2086",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO_FIXED | MACHINE_MOUSE,				640,  640,   0,  63,		  machine_pc2086_init, pc2086_get_device	},
+    { "[8086] Amstrad PC2086",			"pc2086",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO_FIXED | MACHINE_MOUSE,				  640,   640, 640,   63,		  machine_pc2086_init, pc2086_get_device	},
-    { "[8086] Amstrad PC3086",			"pc3086",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO_FIXED | MACHINE_MOUSE,				640,  640,   0,  63,		  machine_pc3086_init, pc3086_get_device	},
+    { "[8086] Amstrad PC3086",			"pc3086",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO_FIXED | MACHINE_MOUSE,				  640,   640, 640,   63,		  machine_pc3086_init, pc3086_get_device	},
     { "[8086] Amstrad PC20(0)",			"pc200",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO | MACHINE_MOUSE | MACHINE_NONMI,			  512,   640, 128,   63,		   machine_pc200_init, pc200_get_device		},
     { "[8086] Amstrad PPC512/640",		"ppc512",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO | MACHINE_MOUSE | MACHINE_NONMI,			  512,   640, 128,   63,		  machine_ppc512_init, ppc512_get_device	},
     { "[8086] Compaq Deskpro",			"deskpro",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC,									  128,   640, 128,    0,       machine_xt_compaq_deskpro_init, NULL			},
-    { "[8086] Olivetti M24",			"olivetti_m24",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO_FIXED | MACHINE_MOUSE,				128,  640, 128,   0,		  machine_olim24_init, m24_get_device		},
+    { "[8086] Olivetti M24",			"olivetti_m24",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO | MACHINE_MOUSE,				  128,   640, 128,    0,		  machine_xt_olim24_init, m24_get_device		},
     { "[8086] Schetmash Iskra-3104",		"iskra3104",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC,									  128,   640, 128,    0,	    machine_xt_iskra3104_init, NULL			},
     { "[8086] Tandy 1000 SL/2",			"tandy1000sl2",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO_FIXED,						  512,   768, 128,    0,	    machine_tandy1000sl2_init, tandy1k_sl_get_device	},
     { "[8086] Toshiba T1200",			"t1200",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO,							 1024,  2048,1024,   63,		machine_xt_t1200_init, t1200_get_device		},
 
+    { "[8086] Olivetti M240",			"olivetti_m240",		MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,                              MACHINE_PC,             	            			128,  640, 128,   0,		  machine_xt_olim240_init, NULL		},
+    
 #if defined(DEV_BRANCH) && defined(USE_LASERXT)
     { "[8086] VTech Laser XT3",			"lxt3",			MACHINE_TYPE_8086,		CPU_PKG_8086, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC,									  256,   640, 256,    0,		 machine_xt_lxt3_init, NULL			},
 #endif
@@ -102,292 +105,292 @@ const machine_t machines[] = {
 #endif
 
     /* 286 AT machines */
-    { "[ISA] IBM AT",				"ibmat",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 6000000, 8000000, 0, 0, 0, 0,									MACHINE_AT,									256,15872, 128,  63,		  machine_at_ibm_init, NULL			},
+    { "[ISA] IBM AT",				"ibmat",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 6000000, 8000000, 0, 0, 0, 0,									MACHINE_AT,									  256, 15872, 128,   63,		  machine_at_ibm_init, NULL			},
-    { "[ISA] IBM PS/1 model 2011",		"ibmps1es",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 10000000, 10000000, 0, 0, 0, 0,									MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_XTA | MACHINE_VIDEO_FIXED,		512,16384, 512,  63,	       machine_ps1_m2011_init, NULL			},
+    { "[ISA] IBM PS/1 model 2011",		"ibmps1es",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 10000000, 10000000, 0, 0, 0, 0,									MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_XTA | MACHINE_VIDEO_FIXED,		  512, 16384, 512,   63,	       machine_ps1_m2011_init, NULL			},
-    { "[ISA] IBM PS/2 model 30-286",		"ibmps2_m30_286",	MACHINE_TYPE_286,		CPU_PKG_286 | CPU_PKG_486SLC_IBM, 0, 10000000, 0, 0, 0, 0, 0,							MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_XTA | MACHINE_VIDEO_FIXED,		  1,   16,   1, 127,	     machine_ps2_m30_286_init, NULL			},
+    { "[ISA] IBM PS/2 model 30-286",		"ibmps2_m30_286",	MACHINE_TYPE_286,		CPU_PKG_286 | CPU_PKG_486SLC_IBM, 0, 10000000, 0, 0, 0, 0, 0,							MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_XTA | MACHINE_VIDEO_FIXED,		 1024, 16384,1024,  127,	     machine_ps2_m30_286_init, NULL			},
-    { "[ISA] IBM XT Model 286",			"ibmxt286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 6000000, 6000000, 0, 0, 0, 0,									MACHINE_AT,									256,15872, 128, 127,	     machine_at_ibmxt286_init, NULL			},
+    { "[ISA] IBM XT Model 286",			"ibmxt286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 6000000, 6000000, 0, 0, 0, 0,									MACHINE_AT,									  256, 15872, 128,  127,	     machine_at_ibmxt286_init, NULL			},
-    { "[ISA] AMI IBM AT",			"ibmatami",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 6000000, 8000000, 0, 0, 0, 0,									MACHINE_AT,									256,15872, 128,  63,	     machine_at_ibmatami_init, NULL			},
+    { "[ISA] AMI IBM AT",			"ibmatami",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 6000000, 8000000, 0, 0, 0, 0,									MACHINE_AT,									  256, 15872, 128,   63,	     machine_at_ibmatami_init, NULL			},
-    { "[ISA] Commodore PC 30 III",		"cmdpc30",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									640,16384, 128, 127,		machine_at_cmdpc_init, NULL			},
+    { "[ISA] Commodore PC 30 III",		"cmdpc30",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  640, 16384, 128,  127,		machine_at_cmdpc_init, NULL			},
-    { "[ISA] Compaq Portable II",		"portableii",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									640,16384, 128, 127,	   machine_at_portableii_init, NULL			},
+    { "[ISA] Compaq Portable II",		"portableii",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  640, 16384, 128,  127,	   machine_at_portableii_init, NULL			},
-    { "[ISA] Compaq Portable III",		"portableiii",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_VIDEO,							640,16384, 128, 127,	  machine_at_portableiii_init, at_cpqiii_get_device	},
+    { "[ISA] Compaq Portable III",		"portableiii",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_VIDEO,							  640, 16384, 128,  127,	  machine_at_portableiii_init, at_cpqiii_get_device	},
-    { "[ISA] MR 286 clone",			"mr286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE,							512,16384, 128, 127,	        machine_at_mr286_init, NULL			},
+    { "[ISA] MR 286 clone",			"mr286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE,							  512, 16384, 128,  127,	        machine_at_mr286_init, NULL			},
 #if defined(DEV_BRANCH) && defined(USE_OPEN_AT)
-    { "[ISA] OpenAT",				"open_at",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									256,15872, 128,  63,	      machine_at_open_at_init, NULL			},
+    { "[ISA] OpenAT",				"open_at",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  256, 15872, 128,   63,	      machine_at_open_at_init, NULL			},
 #endif
-    { "[ISA] Phoenix IBM AT",			"ibmatpx",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 6000000, 8000000, 0, 0, 0, 0,									MACHINE_AT,									256,15872, 128,  63,	      machine_at_ibmatpx_init, NULL			},
+    { "[ISA] Phoenix IBM AT",			"ibmatpx",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 6000000, 8000000, 0, 0, 0, 0,									MACHINE_AT,									  256, 15872, 128,   63,	      machine_at_ibmatpx_init, NULL			},
-    { "[ISA] Quadtel IBM AT",			"ibmatquadtel",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 6000000, 8000000, 0, 0, 0, 0,									MACHINE_AT,									256,15872, 128,  63,	 machine_at_ibmatquadtel_init, NULL			},
+    { "[ISA] Quadtel IBM AT",			"ibmatquadtel",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 6000000, 8000000, 0, 0, 0, 0,									MACHINE_AT,									  256, 15872, 128,   63,	 machine_at_ibmatquadtel_init, NULL			},
-    { "[ISA] Siemens PCD-2L",			"siemens",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									256,15872, 128,  63,	      machine_at_siemens_init, NULL			},
+    { "[ISA] Siemens PCD-2L",			"siemens",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  256, 15872, 128,   63,	      machine_at_siemens_init, NULL			},
     { "[ISA] Toshiba T3100e",			"t3100e",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE | MACHINE_VIDEO_FIXED,					 1024,  5120, 256,   63,	       machine_at_t3100e_init, NULL			},
-    { "[GC103] Quadtel 286 clone",		"quadt286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									512,16384, 128, 127,	     machine_at_quadt286_init, NULL			},
+    { "[GC103] Quadtel 286 clone",		"quadt286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512, 16384, 128,  127,	     machine_at_quadt286_init, NULL			},
     { "[GC103] Trigem 286M",			"tg286m",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE,							  512,  8192, 128,  127,	       machine_at_tg286m_init, NULL			},
     { "[NEAT] AMI 286 clone",			"ami286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512,  8192, 128,  127,	     machine_at_neat_ami_init, NULL			},
-    { "[NEAT] Phoenix 286 clone",		"px286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									512,16384, 128, 127,	        machine_at_px286_init, NULL			},
+    { "[NEAT] Phoenix 286 clone",		"px286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512, 16384, 128,  127,	        machine_at_px286_init, NULL			},
-    { "[SCAT] Award 286 clone",			"award286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									512,16384, 128, 127,	     machine_at_award286_init, NULL			},
+    { "[SCAT] Award 286 clone",			"award286",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512, 16384, 128,  127,	     machine_at_award286_init, NULL			},
-    { "[SCAT] GW-286CT GEAR",			"gw286ct",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									512,16384, 128, 127,	      machine_at_gw286ct_init, NULL			},
+    { "[SCAT] GW-286CT GEAR",			"gw286ct",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512, 16384, 128,  127,	      machine_at_gw286ct_init, NULL			},
     { "[SCAT] Goldstar GDC-212M",		"gdc212m",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE | MACHINE_BUS_PS2,					  512,  4096, 512,  127,	      machine_at_gdc212m_init, NULL			},
-    { "[SCAT] Hyundai Super-286TR",		"super286tr",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									512,16384, 128, 127,	   machine_at_super286tr_init, NULL			},
+    { "[SCAT] Hyundai Super-286TR",		"super286tr",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512, 16384, 128,  127,	   machine_at_super286tr_init, NULL			},
     { "[SCAT] Samsung SPC-4200P",		"spc4200p",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2,							  512,  2048, 128,  127,	     machine_at_spc4200p_init, NULL			},
-    { "[SCAT] Samsung SPC-4216P",		"spc4216p",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2,							  1,    5,   1, 127,	     machine_at_spc4216p_init, NULL			},
+    { "[SCAT] Samsung SPC-4216P",		"spc4216p",		MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2,							 1024,  5120,1024,  127,	     machine_at_spc4216p_init, NULL			},
-    { "[SCAT] Samsung Deskmaster 286",		"deskmaster286",	MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									512,16384, 128, 127,	machine_at_deskmaster286_init, NULL			},
+    { "[SCAT] Samsung Deskmaster 286",		"deskmaster286",	MACHINE_TYPE_286,		CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512, 16384, 128,  127,	machine_at_deskmaster286_init, NULL			},
 
     /* 286 machines that utilize the MCA bus */
-    { "[MCA] IBM PS/2 model 50",		"ibmps2_m50",		MACHINE_TYPE_286,		CPU_PKG_286 | CPU_PKG_486SLC_IBM, 0, 10000000, 0, 0, 0, 0, 0,							MACHINE_MCA | MACHINE_BUS_PS2 | MACHINE_VIDEO,					  1,   10,   1,  63,	    machine_ps2_model_50_init, NULL			},
+    { "[MCA] IBM PS/2 model 50",		"ibmps2_m50",		MACHINE_TYPE_286,		CPU_PKG_286 | CPU_PKG_486SLC_IBM, 0, 10000000, 0, 0, 0, 0, 0,							MACHINE_MCA | MACHINE_BUS_PS2 | MACHINE_VIDEO,					 1024, 10240,1024,   63,	    machine_ps2_model_50_init, NULL			},
 
     /* 386SX machines */
-    { "[ISA] IBM PS/1 model 2121",		"ibmps1_2121",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO_FIXED,		  2,    6,   1,  63,	       machine_ps1_m2121_init, NULL			},
+    { "[ISA] IBM PS/1 model 2121",		"ibmps1_2121",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO_FIXED,		 2048,  6144,1024,   63,	       machine_ps1_m2121_init, NULL			},
-    { "[ISA] IBM PS/1 m.2121+ISA",		"ibmps1_2121_isa",	MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			  2,    6,   1,  63,	       machine_ps1_m2121_init, NULL			},
+    { "[ISA] IBM PS/1 m.2121+ISA",		"ibmps1_2121_isa",	MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			 2048,  6144,1024,   63,	       machine_ps1_m2121_init, NULL			},
 #if defined(DEV_BRANCH) && defined(USE_M6117)
-    { "[ALi M6117D] Acrosser AR-B1375",		"arb1375",		MACHINE_TYPE_386SX,		CPU_PKG_M6117, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE,					  1,   32,   1, 127,	      machine_at_arb1375_init, NULL			},
+    { "[ALi M6117D] Acrosser AR-B1375",		"arb1375",		MACHINE_TYPE_386SX,		CPU_PKG_M6117, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE,					 1024, 32768,1024,  127,	      machine_at_arb1375_init, NULL			},
-    { "[ALi M6117D] Acrosser PJ-A511M",		"pja511m",		MACHINE_TYPE_386SX,		CPU_PKG_M6117, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE,					  1,   32,   1, 127,	      machine_at_pja511m_init, NULL			},
+    { "[ALi M6117D] Acrosser PJ-A511M",		"pja511m",		MACHINE_TYPE_386SX,		CPU_PKG_M6117, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE,					 1024, 32768,1024,  127,	      machine_at_pja511m_init, NULL			},
 #endif
     { "[HT18] AMA-932J",			"ama932j",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE | MACHINE_VIDEO,					  512,  8192,  128, 127,	      machine_at_ama932j_init, at_ama932j_get_device 	},
     { "[Intel 82335] ADI 386SX",		"adi386sx",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512,  8192,  128, 127,	     machine_at_adi386sx_init, NULL			},
     { "[Intel 82335] Shuttle 386SX",		"shuttle386sx",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512,  8192,  128, 127,	 machine_at_shuttle386sx_init, NULL			},
     { "[NEAT] DTK 386SX clone",			"dtk386",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512,  8192,  128, 127,		 machine_at_neat_init, NULL			},
-    { "[OPTi 291] DTK PPM-3333P",		"awardsx",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  1,   16,   1, 127,	      machine_at_awardsx_init, NULL			},
+    { "[OPTi 291] DTK PPM-3333P",		"awardsx",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									 1024, 16384, 1024, 127,	      machine_at_awardsx_init, NULL			},
-    { "[SCAMP] Commodore SL386SX",		"cbm_sl386sx25",	MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,		       1024, 8192, 512, 127,machine_at_commodore_sl386sx_init, at_commodore_sl386sx_get_device	},  
+    { "[SCAMP] Commodore SL386SX",		"cbm_sl386sx25",	MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			 1024,  8192,  512, 127,    machine_at_commodore_sl386sx_init, at_commodore_sl386sx_get_device	},  
-    { "[SCAT] KMX-C-02",			"kmxc02",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									512,16384, 512, 127,	       machine_at_kmxc02_init, NULL			},
+    { "[SCAT] KMX-C-02",			"kmxc02",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512, 16384,  512, 127,	       machine_at_kmxc02_init, NULL			},
-    { "[WD76C10] Amstrad MegaPC",		"megapc",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			  1,   32,   1, 127,	      machine_at_wd76c10_init, NULL			},
+    { "[WD76C10] Amstrad MegaPC",		"megapc",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			 1024, 32768, 1024, 127,	      machine_at_wd76c10_init, NULL			},
 
     /* 386SX machines which utilize the MCA bus */
-    { "[MCA] IBM PS/2 model 55SX",		"ibmps2_m55sx",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_MCA | MACHINE_BUS_PS2 | MACHINE_VIDEO,					  1,    8,   1,  63,	  machine_ps2_model_55sx_init, NULL			},
+    { "[MCA] IBM PS/2 model 55SX",		"ibmps2_m55sx",		MACHINE_TYPE_386SX,		CPU_PKG_386SX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_MCA | MACHINE_BUS_PS2 | MACHINE_VIDEO,					 1024,  8192, 1024,  63,	  machine_ps2_model_55sx_init, NULL			},
 
     /* 386DX machines */
-    { "[ACC 2168] AMI 386DX clone",		"acc386",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  1,   16,   1, 127,	       machine_at_acc386_init, NULL			},
+    { "[ACC 2168] AMI 386DX clone",		"acc386",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									 1024, 16384, 1024, 127,	       machine_at_acc386_init, NULL			},
-    { "[C&T 386] ECS 386/32",			"ecs386",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  1,   16,   1, 127,	       machine_at_ecs386_init, NULL			},		
+    { "[C&T 386] ECS 386/32",			"ecs386",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									 1024, 16384, 1024, 127,	       machine_at_ecs386_init, NULL			},		
-    { "[ISA] Compaq Portable III (386)",	"portableiii386",       MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE | MACHINE_VIDEO,		  			  1,   14,   1, 127,   machine_at_portableiii386_init, at_cpqiii_get_device	},
+    { "[ISA] Compaq Portable III (386)",	"portableiii386",       MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE | MACHINE_VIDEO,					 1024, 14336, 1024, 127,       machine_at_portableiii386_init, at_cpqiii_get_device	},
     { "[ISA] Micronics 386 clone",		"micronics386",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512,  8192,  128, 127,	 machine_at_micronics386_init, NULL			},
-    { "[SiS 310] ASUS ISA-386C",		"asus386",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									512,16384, 128, 127,	      machine_at_asus386_init, NULL			},
+    { "[SiS 310] ASUS ISA-386C",		"asus386",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  512, 16384,  128, 127,	      machine_at_asus386_init, NULL			},
-    { "[UMC 491] US Technologies 386",		"ustechnologies386",	MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,								          1,   16,   1, 127,machine_at_ustechnologies386_init, NULL			},
+    { "[UMC 491] US Technologies 386",		"ustechnologies386",	MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									 1024, 16384, 1024, 127,    machine_at_ustechnologies386_init, NULL			},
 
     /* 386DX machines which utilize the VLB bus */
-    { "[OPTi 495] Award 386DX clone",		"award386dx",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   32,   1, 127,	      machine_at_opti495_init, NULL			},
+    { "[OPTi 495] Award 386DX clone",		"award386dx",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 32768, 1024, 127,	      machine_at_opti495_init, NULL			},
-    { "[OPTi 495] Dataexpert SX495 (386DX)",	"ami386dx",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   32,   1, 127,	  machine_at_opti495_ami_init, NULL			},
+    { "[OPTi 495] Dataexpert SX495 (386DX)",	"ami386dx",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 32768, 1024, 127,	  machine_at_opti495_ami_init, NULL			},
-    { "[OPTi 495] MR 386DX clone",		"mr386dx",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   32,   1, 127,	   machine_at_opti495_mr_init, NULL			},
+    { "[OPTi 495] MR 386DX clone",		"mr386dx",		MACHINE_TYPE_386DX,		CPU_PKG_386DX, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 32768, 1024, 127,	   machine_at_opti495_mr_init, NULL			},
 
     /* 386DX machines which utilize the MCA bus */
-    { "[MCA] IBM PS/2 model 70 (type 3)",	"ibmps2_m70_type3",	MACHINE_TYPE_386DX,		CPU_PKG_386DX | CPU_PKG_486BL, 0, 0, 0, 0, 0, 0, 0,								MACHINE_MCA | MACHINE_BUS_PS2 | MACHINE_VIDEO,					  2,   16,   2,  63,  machine_ps2_model_70_type3_init, NULL			},
+    { "[MCA] IBM PS/2 model 70 (type 3)",	"ibmps2_m70_type3",	MACHINE_TYPE_386DX,		CPU_PKG_386DX | CPU_PKG_486BL, 0, 0, 0, 0, 0, 0, 0,								MACHINE_MCA | MACHINE_BUS_PS2 | MACHINE_VIDEO,					 2048, 16384, 2048,  63,      machine_ps2_model_70_type3_init, NULL			},
-    { "[MCA] IBM PS/2 model 80",		"ibmps2_m80",		MACHINE_TYPE_386DX,		CPU_PKG_386DX | CPU_PKG_486BL, 0, 0, 0, 0, 0, 0, 0,								MACHINE_MCA | MACHINE_BUS_PS2 | MACHINE_VIDEO,					  1,   12,   1,  63,	    machine_ps2_model_80_init, NULL			},
+    { "[MCA] IBM PS/2 model 80",		"ibmps2_m80",		MACHINE_TYPE_386DX,		CPU_PKG_386DX | CPU_PKG_486BL, 0, 0, 0, 0, 0, 0, 0,								MACHINE_MCA | MACHINE_BUS_PS2 | MACHINE_VIDEO,					 1024, 12288, 1024,  63,	    machine_ps2_model_80_init, NULL			},
 
     /* 486 machines with just the ISA slot */
-    { "[ACC 2168] Packard Bell PB410A",		"pb410a",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,	 	 	  4,   36,   1, 127,	       machine_at_pb410a_init, NULL			},
+    { "[ACC 2168] Packard Bell PB410A",		"pb410a",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			 4096, 36864, 1024, 127,	       machine_at_pb410a_init, NULL			},
 
     /* 486 machines */
-    { "[ALi M1429G] Acer A1G",			"acera1g",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		  4,   36,   1, 127,	      machine_at_acera1g_init, at_acera1g_get_device	},
+    { "[ALi M1429G] Acer A1G",			"acera1g",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		 4096, 36864, 1024, 127,	      machine_at_acera1g_init, at_acera1g_get_device	},
-    { "[ALi M1429] AMI WinBIOS 486",		"win486",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   32,   1, 127,	  machine_at_winbios1429_init, NULL			},
+    { "[ALi M1429] AMI WinBIOS 486",		"win486",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 32768, 1024, 127,	  machine_at_winbios1429_init, NULL			},
-    { "[ALi M1429] Olystar LIL1429",		"ali1429",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   32,   1, 127,	      machine_at_ali1429_init, NULL			},
+    { "[ALi M1429] Olystar LIL1429",		"ali1429",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 32768, 1024, 127,	      machine_at_ali1429_init, NULL			},
-    { "[CS4031] AMI 486 CS4031",		"cs4031",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB,									  1,   64,   1, 127,	       machine_at_cs4031_init, NULL			},
+    { "[CS4031] AMI 486 CS4031",		"cs4031",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB,									 1024, 65536, 1024, 127,	       machine_at_cs4031_init, NULL			},
-    { "[OPTi 283] RYC Leopard LX",		"rycleopardlx",		MACHINE_TYPE_486,		CPU_PKG_486SLC_IBM, 0, 0, 0, 0, 0, 0, 0,									MACHINE_AT | MACHINE_IDE,							  1,   16,   1, 127,     machine_at_rycleopardlx_init, NULL			},
+    { "[OPTi 283] RYC Leopard LX",		"rycleopardlx",		MACHINE_TYPE_486,		CPU_PKG_486SLC_IBM, 0, 0, 0, 0, 0, 0, 0,									MACHINE_AT | MACHINE_IDE,							 1024, 16384, 1024, 127,	 machine_at_rycleopardlx_init, NULL			},
-    { "[OPTi 495] Award 486 clone",		"award486",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   32,   1, 127,	      machine_at_opti495_init, NULL			},
+    { "[OPTi 495] Award 486 clone",		"award486",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 32768, 1024, 127,	      machine_at_opti495_init, NULL			},
-    { "[OPTi 495] Dataexpert SX495 (486)",	"ami486",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   32,   1, 127,	  machine_at_opti495_ami_init, NULL			},
+    { "[OPTi 495] Dataexpert SX495 (486)",	"ami486",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 32768, 1024, 127,	  machine_at_opti495_ami_init, NULL			},
-    { "[OPTi 495] MR 486 clone",		"mr486",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   32,   1, 127,	   machine_at_opti495_mr_init, NULL			},
+    { "[OPTi 495] MR 486 clone",		"mr486",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 32768, 1024, 127,	   machine_at_opti495_mr_init, NULL			},
-    { "[OPTi 802G] IBM PC 330 (type 6571)",	"pc330_6571",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3_PC330, 0, 25000000, 33333333, 0, 0, 2.0, 3.0,							MACHINE_VLB | MACHINE_BUS_PS2 | MACHINE_IDE,					  1,   64,   1, 127,	   machine_at_pc330_6571_init, NULL			},
+    { "[OPTi 802G] IBM PC 330 (type 6571)",	"pc330_6571",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3_PC330, 0, 25000000, 33333333, 0, 0, 2.0, 3.0,							MACHINE_VLB | MACHINE_BUS_PS2 | MACHINE_IDE,					 1024, 65536, 1024, 127,	   machine_at_pc330_6571_init, NULL			},
-    { "[OPTi 895] Jetway J-403TG",		"403tg",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB,									  1,   64,   1, 127,	        machine_at_403tg_init, NULL			},
+    { "[OPTi 895] Jetway J-403TG",		"403tg",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB,									 1024, 65536, 1024, 127,	        machine_at_403tg_init, NULL			},
-    { "[SiS 401] AMI 486 Clone",		"sis401",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE,							  1,   64,   1, 127,	       machine_at_sis401_init, NULL			},
+    { "[SiS 401] AMI 486 Clone",		"sis401",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_IDE,							 1024, 65536, 1024, 127,	       machine_at_sis401_init, NULL			},
-    { "[SiS 461] IBM PS/ValuePoint 433DX/Si",	"valuepoint433",	MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE,					  1,   64,   1, 127,	       machine_at_valuepoint433_init, NULL			},
+    { "[SiS 461] IBM PS/ValuePoint 433DX/Si",	"valuepoint433",	MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE,					 1024, 65536, 1024, 127,	machine_at_valuepoint433_init, NULL			},
-    { "[SiS 471] AMI 486 Clone",		"ami471",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   64,   1, 127,	       machine_at_ami471_init, NULL			},
+    { "[SiS 471] AMI 486 Clone",		"ami471",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 65536, 1024, 127,	       machine_at_ami471_init, NULL			},
-    { "[SiS 471] AMI WinBIOS 486 clone",	"win471",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   64,   1, 127,	       machine_at_win471_init, NULL			},
+    { "[SiS 471] AMI WinBIOS 486 clone",	"win471",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 65536, 1024, 127,	       machine_at_win471_init, NULL			},
-    { "[SiS 471] AOpen Vi15G",			"vi15g",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   64,   1, 127,	        machine_at_vi15g_init, NULL			},
+    { "[SiS 471] AOpen Vi15G",			"vi15g",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 65536, 1024, 127,	        machine_at_vi15g_init, NULL			},
-    { "[SiS 471] ASUS VL/I-486SV2G (GX4)",	"vli486sv2g",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE_DUAL,							  1,   64,   1, 127,	   machine_at_vli486sv2g_init, NULL			},
+    { "[SiS 471] ASUS VL/I-486SV2G (GX4)",	"vli486sv2g",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE_DUAL,							 1024, 65536, 1024, 127,	   machine_at_vli486sv2g_init, NULL			},
-    { "[SiS 471] DTK PKM-0038S E-2",		"dtk486",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,   64,   1, 127,	       machine_at_dtk486_init, NULL			},
+    { "[SiS 471] DTK PKM-0038S E-2",		"dtk486",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024, 65536, 1024, 127,	       machine_at_dtk486_init, NULL			},
-    { "[SiS 471] Phoenix SiS 471",		"px471",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							  1,  128,   1, 127,	        machine_at_px471_init, NULL			},
+    { "[SiS 471] Phoenix SiS 471",		"px471",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_IDE,							 1024,131072, 1024, 127,	        machine_at_px471_init, NULL			},
-    { "[VIA VT82C495] FIC 486-VC-HD",		"486vchd",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									  1,   32,   1, 127,	      machine_at_486vchd_init, NULL			},
+    { "[VIA VT82C495] FIC 486-VC-HD",		"486vchd",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT,									 1024, 32768, 1024, 127,	      machine_at_486vchd_init, NULL			},
-    { "[VLSI 82C480] IBM PS/1 model 2133",	"ibmps1_2133",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_NONMI | MACHINE_VIDEO,	  2,   32,   1, 127,	       machine_ps1_m2133_init, ps1_m2133_get_device	},
+    { "[VLSI 82C480] IBM PS/1 model 2133",	"ibmps1_2133",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_VLB | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_NONMI | MACHINE_VIDEO,	 2048, 32768, 1024, 127,	       machine_ps1_m2133_init, ps1_m2133_get_device	},
 #if defined(DEV_BRANCH) && defined(USE_VECT486VL)
-    { "[VLSI 82C480] HP Vectra 486VL",		"vect486vl",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			  2,   64,   1, 127,	    machine_at_vect486vl_init, at_vect486vl_get_device	},
+    { "[VLSI 82C480] HP Vectra 486VL",		"vect486vl",		MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO,			 2048, 65536, 1024, 127,	    machine_at_vect486vl_init, at_vect486vl_get_device	},
 #endif
 
     /* 486 machines with utilize the MCA bus */
 #if defined(DEV_BRANCH) && defined(USE_PS2M70T4)
-    { "[MCA] IBM PS/2 model 70 (type 4)",	"ibmps2_m70_type4",	MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_MCA | MACHINE_BUS_PS2 | MACHINE_VIDEO,					  2,   16,   2,  63,  machine_ps2_model_70_type4_init, NULL			},
+    { "[MCA] IBM PS/2 model 70 (type 4)",	"ibmps2_m70_type4",	MACHINE_TYPE_486,		CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0,										MACHINE_MCA | MACHINE_BUS_PS2 | MACHINE_VIDEO,					 2048,  16384, 2048,  63,     machine_ps2_model_70_type4_init, NULL			},
 #endif
 
     /* 486 machines which utilize the PCI bus */
 #if defined(DEV_BRANCH) && defined(USE_M1489)
-    { "[ALi M1489] ABIT AB-PB4",		"abpb4",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							  1,  64,   1, 255,		machine_at_abpb4_init, NULL			},
+    { "[ALi M1489] ABIT AB-PB4",		"abpb4",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							 1024,  65536, 1024, 255,		machine_at_abpb4_init, NULL			},
 #endif
-    { "[i420EX] ASUS PVI-486AP4",		"486ap4",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCIV | MACHINE_IDE_DUAL,						  1,  128,   1, 127,	       machine_at_486ap4_init, NULL			},
+    { "[i420EX] ASUS PVI-486AP4",		"486ap4",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCIV | MACHINE_IDE_DUAL,						 1024, 131072, 1024, 127,	       machine_at_486ap4_init, NULL			},
-    { "[i420ZX] ASUS PCI/I-486SP3G",		"486sp3g",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							  1,  128,   1, 127,	      machine_at_486sp3g_init, NULL			},
+    { "[i420ZX] ASUS PCI/I-486SP3G",		"486sp3g",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							 1024, 131072, 1024, 127,	      machine_at_486sp3g_init, NULL			},
-    { "[i420TX] Intel Classic/PCI",		"alfredo",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		  2,  128,   2, 127,	      machine_at_alfredo_init, NULL			},
+    { "[i420TX] Intel Classic/PCI",		"alfredo",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		 2048, 131072, 2048, 127,	      machine_at_alfredo_init, NULL			},
-    { "[SiS 496] Lucky Star LS-486E",		"ls486e",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							  1,  128,   1, 255,	       machine_at_ls486e_init, NULL			},
+    { "[SiS 496] Lucky Star LS-486E",		"ls486e",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							 1024, 131072, 1024, 255,	       machine_at_ls486e_init, NULL			},
-    { "[SiS 496] Micronics M4Li",		"m4li",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  1,  128,   1, 127,		 machine_at_m4li_init, NULL			},
+    { "[SiS 496] Micronics M4Li",		"m4li",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 1024, 131072, 1024, 127,		 machine_at_m4li_init, NULL			},
-    { "[SiS 496] Rise Computer R418",		"r418",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							  1,  255,   1, 255,		 machine_at_r418_init, NULL			},
+    { "[SiS 496] Rise Computer R418",		"r418",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							 1024, 261120, 1024, 255,		 machine_at_r418_init, NULL			},
-    { "[SiS 496] Soyo 4SA2",			"4sa2",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							  1,  255,   1, 255,		 machine_at_4sa2_init, NULL			},
+    { "[SiS 496] Soyo 4SA2",			"4sa2",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							 1024, 261120, 1024, 255,		 machine_at_4sa2_init, NULL			},
-    { "[SiS 496] Zida Tomato 4DP",		"4dps",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							  1,  255,   1, 255,		 machine_at_4dps_init, NULL			},
+    { "[SiS 496] Zida Tomato 4DP",		"4dps",			MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCI | MACHINE_IDE_DUAL,							 1024, 261120, 1024, 255,		 machine_at_4dps_init, NULL			},
 #if defined(DEV_BRANCH) && defined(USE_STPC)
-    { "[STPC Client] ITOX STAR",		"itoxstar",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 75000000, 0, 0, 1.0, 1.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  128,   8, 255,	     machine_at_itoxstar_init, NULL			},
+    { "[STPC Client] ITOX STAR",		"itoxstar",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 75000000, 0, 0, 1.0, 1.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 255,	     machine_at_itoxstar_init, NULL			},
-    { "[STPC Consumer-II] Acrosser AR-B1479",	"arb1479",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 32,  160,   8, 255,	      machine_at_arb1479_init, NULL			},
+    { "[STPC Consumer-II] Acrosser AR-B1479",	"arb1479",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				32768, 163840, 8192, 255,	      machine_at_arb1479_init, NULL			},
-    { "[STPC Elite] Advantech PCM-9340",	"pcm9340",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 32,   96,   8, 255,	      machine_at_pcm9340_init, NULL			},
+    { "[STPC Elite] Advantech PCM-9340",	"pcm9340",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				32768,  98304, 8192, 255,	      machine_at_pcm9340_init, NULL			},
-    { "[STPC Atlas] AAEON PCM-5330",		"pcm5330",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 32,  128,  32, 255,	      machine_at_pcm5330_init, NULL			},
+    { "[STPC Atlas] AAEON PCM-5330",		"pcm5330",		MACHINE_TYPE_486,		CPU_PKG_STPC, 0, 66666667, 66666667, 0, 0, 2.0, 2.0,								MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				32768, 131072,32768, 255,	      machine_at_pcm5330_init, NULL			},
 #endif
 #if defined(DEV_BRANCH) && defined(NO_SIO)
-    { "[VIA VT82C496G] FIC VIP-IO2",		"486vipio2",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCIV | MACHINE_IDE_DUAL,						  1,  128,   1, 255,	    machine_at_486vipio2_init, NULL			},
+    { "[VIA VT82C496G] FIC VIP-IO2",		"486vipio2",		MACHINE_TYPE_486,		CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PCIV | MACHINE_IDE_DUAL,						 1024, 131072, 1024, 255,	    machine_at_486vipio2_init, NULL			},
 #endif
 
     /* Socket 4 machines */
     /* 430LX */
-    { "[i430LX] ASUS P/I-P5MP3",		"p5mp3",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE,		 			  2,  192,   2, 127,	        machine_at_p5mp3_init, NULL			},
+    { "[i430LX] ASUS P/I-P5MP3",		"p5mp3",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE,		 			 2048, 196608, 2048, 127,	        machine_at_p5mp3_init, NULL			},
 #if defined(DEV_BRANCH) && defined(USE_DELLS4)
-    { "[i430LX] Dell Dimension XPS P60",	"dellxp60",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE,					  2,  128,   2, 127,	     machine_at_dellxp60_init, NULL			},
+    { "[i430LX] Dell Dimension XPS P60",	"dellxp60",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE,					 2048, 131072, 2048, 127,	     machine_at_dellxp60_init, NULL			},
-    { "[i430LX] Dell OptiPlex 560/L",		"opti560l",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,	     machine_at_opti560l_init, NULL			},
+    { "[i430LX] Dell OptiPlex 560/L",		"opti560l",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 2048, 131072, 2048, 127,	     machine_at_opti560l_init, NULL			},
 #endif
-    { "[i430LX] IBM Ambra DP60 PCI",		"ambradp60",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,	    machine_at_ambradp60_init, NULL			},
+    { "[i430LX] IBM Ambra DP60 PCI",		"ambradp60",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 2048, 131072, 2048, 127,	    machine_at_ambradp60_init, NULL			},
-    { "[i430LX] IBM PS/ValuePoint P60",		"valuepointp60",	MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  2,  128,   2, 127,	machine_at_valuepointp60_init, NULL			},
+    { "[i430LX] IBM PS/ValuePoint P60",		"valuepointp60",	MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 2048, 131072, 2048, 127,	machine_at_valuepointp60_init, NULL			},
-    { "[i430LX] Intel Premiere/PCI",		"revenge",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,	       machine_at_batman_init, NULL			},
+    { "[i430LX] Intel Premiere/PCI",		"revenge",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 2048, 131072, 2048, 127,	       machine_at_batman_init, NULL			},
-    { "[i430LX] Micro Star 586MC1",		"586mc1",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  2,  128,   2, 127,	       machine_at_586mc1_init, NULL			},
+    { "[i430LX] Micro Star 586MC1",		"586mc1",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 2048, 131072, 2048, 127,	       machine_at_586mc1_init, NULL			},
-    { "[i430LX] Packard Bell PB520R",		"pb520r",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		  8,  136,   2, 127,	       machine_at_pb520r_init, at_pb520r_get_device	},
+    { "[i430LX] Packard Bell PB520R",		"pb520r",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, MACHINE_MULTIPLIER_FIXED,						MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		 8192, 139264, 2048, 127,	       machine_at_pb520r_init, at_pb520r_get_device	},
 
     /* OPTi 596/597 */
-    { "[OPTi 597] AMI Excalibur VLB",		"excalibur",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, 1.0, 1.0,								MACHINE_VLB | MACHINE_IDE,							  2,   64,   2, 127,	    machine_at_excalibur_init, NULL			},
+    { "[OPTi 597] AMI Excalibur VLB",		"excalibur",		MACHINE_TYPE_SOCKET4,		CPU_PKG_SOCKET4, 0, 60000000, 66666667, 0, 0, 1.0, 1.0,								MACHINE_VLB | MACHINE_IDE,							 2048,  65536, 2048, 127,	    machine_at_excalibur_init, NULL			},
 
     /* Socket 5 machines */
     /* 430NX */
-    { "[i430NX] Intel Premiere/PCI II",		"plato",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3520, 3520, 1.5, 1.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,		machine_at_plato_init, NULL			},
+    { "[i430NX] Intel Premiere/PCI II",		"plato",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3520, 3520, 1.5, 1.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 2048, 131072, 2048, 127,		machine_at_plato_init, NULL			},
-    { "[i430NX] IBM Ambra DP90 PCI",		"ambradp90",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 1.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,	    machine_at_ambradp90_init, NULL			},
+    { "[i430NX] IBM Ambra DP90 PCI",		"ambradp90",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 1.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 2048, 131072, 2048, 127,	    machine_at_ambradp90_init, NULL			},
-    { "[i430NX] Gigabyte GA-586IP",		"430nx",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 60000000, 66666667, 3520, 3520, 1.5, 1.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  2,  128,   2, 127,		machine_at_430nx_init, NULL			},
+    { "[i430NX] Gigabyte GA-586IP",		"430nx",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 60000000, 66666667, 3520, 3520, 1.5, 1.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 2048, 131072, 2048, 127,		machine_at_430nx_init, NULL			},
 
     /* 430FX */
-    { "[i430FX] Acer V30",			"acerv30",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  128,   8, 127,	      machine_at_acerv30_init, NULL			},
+    { "[i430FX] Acer V30",			"acerv30",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,	      machine_at_acerv30_init, NULL			},
-    { "[i430FX] AMI Apollo",			"apollo",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  128,   8, 127,	       machine_at_apollo_init, NULL			},
+    { "[i430FX] AMI Apollo",			"apollo",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,	       machine_at_apollo_init, NULL			},
-    { "[i430FX] HP Vectra VL 5 Series 4",	"vectra54",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		  8,  128,   8, 511,	     machine_at_vectra54_init, at_vectra54_get_device	},
+    { "[i430FX] HP Vectra VL 5 Series 4",	"vectra54",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		 8192, 131072, 8192, 511,	     machine_at_vectra54_init, at_vectra54_get_device	},
-    { "[i430FX] Intel Advanced/ZP",		"zappa",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  128,   8, 127,		machine_at_zappa_init, NULL			},
+    { "[i430FX] Intel Advanced/ZP",		"zappa",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,		machine_at_zappa_init, NULL			},
-    { "[i430FX] NEC PowerMate V",  		"powermate_v",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  128,   8, 127,	  machine_at_powermate_v_init, NULL			},
+    { "[i430FX] NEC PowerMate V",  		"powermate_v",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,	  machine_at_powermate_v_init, NULL			},
-    { "[i430FX] PC Partner MB500N",		"mb500n",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_IDE_DUAL,							  8,  128,   8, 127,	       machine_at_mb500n_init, NULL			},
+    { "[i430FX] PC Partner MB500N",		"mb500n",		MACHINE_TYPE_SOCKET5,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_IDE_DUAL,							 8192, 131072, 8192, 127,	       machine_at_mb500n_init, NULL			},
 
     /* Socket 7 machines */
     /* 430FX */
-    { "[i430FX] ASUS P/I-P54TP4XE",		"p54tp4xe",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3600, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  128,   8, 127,	     machine_at_p54tp4xe_init, NULL			},
+    { "[i430FX] ASUS P/I-P54TP4XE",		"p54tp4xe",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3600, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,	     machine_at_p54tp4xe_init, NULL			},
-    { "[i430FX] ASUS P/I-P54TP4XE (MR BIOS)",	"mr586",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3600, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  128,   8, 127,	        machine_at_mr586_init, NULL			},
+    { "[i430FX] ASUS P/I-P54TP4XE (MR BIOS)",	"mr586",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3600, 1.5, 2.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,	        machine_at_mr586_init, NULL			},
-    { "[i430FX] Gateway 2000 Thor",		"gw2katx",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		  8,  128,   8, 127,	      machine_at_gw2katx_init, NULL			},
+    { "[i430FX] Gateway 2000 Thor",		"gw2katx",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		 8192, 131072, 8192, 127,	      machine_at_gw2katx_init, NULL			},
-    { "[i430FX] Intel Advanced/ATX",		"thor",			MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		  8,  128,   8, 127,		 machine_at_thor_init, NULL			},
+    { "[i430FX] Intel Advanced/ATX",		"thor",			MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		 8192, 131072, 8192, 127,		 machine_at_thor_init, NULL			},
-    { "[i430FX] Intel Advanced/ATX (MR BIOS)",	"mrthor",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		  8,  128,   8, 127,	       machine_at_mrthor_init, NULL			},
+    { "[i430FX] Intel Advanced/ATX (MR BIOS)",	"mrthor",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		 8192, 131072, 8192, 127,	       machine_at_mrthor_init, NULL			},
-    { "[i430FX] Intel Advanced/EV",		"endeavor",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		  8,  128,   8, 127,	     machine_at_endeavor_init, at_endeavor_get_device	},
+    { "[i430FX] Intel Advanced/EV",		"endeavor",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		 8192, 131072, 8192, 127,	     machine_at_endeavor_init, at_endeavor_get_device	},
-    { "[i430FX] Packard Bell PB640",		"pb640",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO, 		  8,  128,   8, 127,		machine_at_pb640_init, at_pb640_get_device	},
+    { "[i430FX] Packard Bell PB640",		"pb640",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO, 		 8192, 131072, 8192, 127,		machine_at_pb640_init, at_pb640_get_device	},
-    { "[i430FX] QDI Chariot",			"chariot",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, CPU_WINCHIP|CPU_WINCHIP2|CPU_Cx6x86|CPU_Cx6x86L|CPU_Cx6x86MX, 50000000, 66666667, 3380, 3520, 1.5, 3.0, MACHINE_PCI | MACHINE_IDE_DUAL,				 	  8,  128,   8, 127,	      machine_at_chariot_init, NULL			},
+    { "[i430FX] QDI Chariot",			"chariot",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, CPU_WINCHIP|CPU_WINCHIP2|CPU_Cx6x86|CPU_Cx6x86L|CPU_Cx6x86MX, 50000000, 66666667, 3380, 3520, 1.5, 3.0, MACHINE_PCI | MACHINE_IDE_DUAL,				 	 8192, 131072, 8192, 127,	      machine_at_chariot_init, NULL			},
 
     /* 430HX */
-    { "[i430HX] Acer M3A",			"acerm3a",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3300, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  192,   8, 127,	      machine_at_acerm3a_init, NULL			},
+    { "[i430HX] Acer M3A",			"acerm3a",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3300, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 196608, 8192, 127,	      machine_at_acerm3a_init, NULL			},
-    { "[i430HX] AOpen AP53",			"ap53",			MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3450, 3520, 1.5, 2.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  512,   8, 127,		 machine_at_ap53_init, NULL			},
+    { "[i430HX] AOpen AP53",			"ap53",			MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3450, 3520, 1.5, 2.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 524288, 8192, 127,		 machine_at_ap53_init, NULL			},
-    { "[i430HX] Biostar MB-8500TUC",		"8500tuc",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  512,   8, 127,	      machine_at_8500tuc_init, NULL			},
+    { "[i430HX] Biostar MB-8500TUC",		"8500tuc",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 524288, 8192, 127,	      machine_at_8500tuc_init, NULL			},
-    { "[i430HX] SuperMicro Super P55T2S",	"p55t2s",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3300, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  768,   8, 127,	       machine_at_p55t2s_init, NULL			},
+    { "[i430HX] SuperMicro Super P55T2S",	"p55t2s",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3300, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 786432, 8192, 127,	       machine_at_p55t2s_init, NULL			},
 
-    { "[i430HX] Acer V35N",			"acerv35n",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  192,   8, 127,	     machine_at_acerv35n_init, NULL			},
+    { "[i430HX] Acer V35N",			"acerv35n",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 196608, 8192, 127,	     machine_at_acerv35n_init, NULL			},
-    { "[i430HX] ASUS P/I-P55T2P4",		"p55t2p4",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 83333333, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  256,   8, 127,	      machine_at_p55t2p4_init, NULL			},
+    { "[i430HX] ASUS P/I-P55T2P4",		"p55t2p4",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 83333333, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 262144, 8192, 127,	      machine_at_p55t2p4_init, NULL			},
-    { "[i430HX] Micronics M7S-Hi",		"m7shi",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  128,   8, 511,	        machine_at_m7shi_init, NULL			},
+    { "[i430HX] Micronics M7S-Hi",		"m7shi",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 131072, 8192, 511,	        machine_at_m7shi_init, NULL			},
-    { "[i430HX] Intel TC430HX",			"tc430hx",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		  8,  128,   8, 255,	      machine_at_tc430hx_init, NULL			},
+    { "[i430HX] Intel TC430HX",			"tc430hx",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		 8192, 131072, 8192, 255,	      machine_at_tc430hx_init, NULL			},
-    { "[i430HX] Toshiba Equium 5200D",		"equium5200",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		  8,  192,   8, 127,	   machine_at_equium5200_init, NULL			},
+    { "[i430HX] Toshiba Equium 5200D",		"equium5200",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		 8192, 196608, 8192, 127,	   machine_at_equium5200_init, NULL			},
-    { "[i430HX] Sony Vaio PCV-240",		"pcv240",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		  8,  192,   8, 127,	       machine_at_pcv240_init, NULL			},
+    { "[i430HX] Sony Vaio PCV-240",		"pcv240",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		 8192, 196608, 8192, 127,	       machine_at_pcv240_init, NULL			},
-    { "[i430HX] ASUS P/I-P65UP5 (C-P55T2D)",	"p65up5_cp55t2d",	MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		  8,  512,   8, 127,   machine_at_p65up5_cp55t2d_init, NULL			},
+    { "[i430HX] ASUS P/I-P65UP5 (C-P55T2D)",	"p65up5_cp55t2d",	MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		 8192, 524288, 8192, 127,	machine_at_p65up5_cp55t2d_init, NULL			},
 
     /* 430VX */
-    { "[i430VX] ASUS P/I-P55TVP4",		"p55tvp4",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  128,   8, 127,	      machine_at_p55tvp4_init, NULL			},
+    { "[i430VX] ASUS P/I-P55TVP4",		"p55tvp4",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 131072, 8192, 127,	      machine_at_p55tvp4_init, NULL			},
-    { "[i430VX] Biostar MB-8500TVX-A",		"8500tvxa",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2600, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  128,   8, 127,	     machine_at_8500tvxa_init, NULL			},
+    { "[i430VX] Biostar MB-8500TVX-A",		"8500tvxa",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2600, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 131072, 8192, 127,	     machine_at_8500tvxa_init, NULL			},
-    { "[i430VX] Compaq Presario 4500",		"presario4500",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		  8,  128,   8, 127,	 machine_at_presario4500_init, NULL			},
+    { "[i430VX] Compaq Presario 4500",		"presario4500",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_VIDEO,		 8192, 131072, 8192, 127,	 machine_at_presario4500_init, NULL			},
-    { "[i430VX] Epox P55-VA",			"p55va",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		  8,  128,   8, 127,		machine_at_p55va_init, NULL			},
+    { "[i430VX] Epox P55-VA",			"p55va",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		 8192, 131072, 8192, 127,		machine_at_p55va_init, NULL			},
-    { "[i430VX] Gateway 2000 Tigereye",		"gw2kte",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  128,   8, 127,	       machine_at_gw2kte_init, NULL			},
+    { "[i430VX] Gateway 2000 Tigereye",		"gw2kte",		MACHINE_TYPE_SOCKET7_3V,	CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 3380, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 131072, 8192, 127,	       machine_at_gw2kte_init, NULL			},
-    { "[i430VX] HP Brio 80xx",			"brio80xx",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 66666667, 66666667, 2200, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  128,   8, 127,	     machine_at_brio80xx_init, NULL			},
+    { "[i430VX] HP Brio 80xx",			"brio80xx",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 66666667, 66666667, 2200, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 131072, 8192, 127,	     machine_at_brio80xx_init, NULL			},
-    { "[i430VX] Packard Bell PB680",		"pb680",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  128,   8, 127,	        machine_at_pb680_init, NULL			},
+    { "[i430VX] Packard Bell PB680",		"pb680",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 131072, 8192, 127,	        machine_at_pb680_init, NULL			},
-    { "[i430VX] Shuttle HOT-557",		"430vx",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  128,   8, 127,	       machine_at_i430vx_init, NULL			},
+    { "[i430VX] Shuttle HOT-557",		"430vx",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,	       machine_at_i430vx_init, NULL			},
 
     /* 430TX */
-    { "[i430TX] ADLink NuPRO-592",		"nupro592",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 66666667, 66666667, 1900, 2800, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  256,   8, 255,	     machine_at_nupro592_init, NULL			},
+    { "[i430TX] ADLink NuPRO-592",		"nupro592",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 66666667, 66666667, 1900, 2800, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 262144, 8192, 255,	     machine_at_nupro592_init, NULL			},
-    { "[i430TX] ASUS TX97",			"tx97",			MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 75000000, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  256,   8, 255,	         machine_at_tx97_init, NULL			},
+    { "[i430TX] ASUS TX97",			"tx97",			MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 75000000, 2500, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 262144, 8192, 255,	         machine_at_tx97_init, NULL			},
 #if defined(DEV_BRANCH) && defined(NO_SIO)
-    { "[i430TX] Intel AN430TX",			"an430tx",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 60000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  256,   8, 255,	      machine_at_an430tx_init, NULL			},
+    { "[i430TX] Intel AN430TX",			"an430tx",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 60000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 262144, 8192, 255,	      machine_at_an430tx_init, NULL			},
 #endif
-    { "[i430TX] Intel YM430TX",			"ym430tx",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 60000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  256,   8, 255,	      machine_at_ym430tx_init, NULL			},
+    { "[i430TX] Intel YM430TX",			"ym430tx",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 60000000, 66666667, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 262144, 8192, 255,	      machine_at_ym430tx_init, NULL			},
-    { "[i430TX] PC Partner MB540N",		"mb540n",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 60000000, 66666667, 2700, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  256,   8, 255,	       machine_at_mb540n_init, NULL			},
+    { "[i430TX] PC Partner MB540N",		"mb540n",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 60000000, 66666667, 2700, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 262144, 8192, 255,	       machine_at_mb540n_init, NULL			},
-    { "[i430TX] SuperMicro Super P5MMS98",	"p5mms98",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2100, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  256,   8, 255,	      machine_at_p5mms98_init, NULL			},
+    { "[i430TX] SuperMicro Super P5MMS98",	"p5mms98",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 66666667, 2100, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 262144, 8192, 255,	      machine_at_p5mms98_init, NULL			},
 
     /* Apollo VPX */
-    { "[VIA VPX] FIC VA-502",			"ficva502",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 75000000, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  512,   8, 127,	     machine_at_ficva502_init, NULL			},
+    { "[VIA VPX] FIC VA-502",			"ficva502",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 50000000, 75000000, 2800, 3520, 1.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 524288, 8192, 127,	     machine_at_ficva502_init, NULL			},
 
     /* Apollo VP3 */
-    { "[VIA VP3] FIC PA-2012",			"ficpa2012",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 55000000, 75000000, 2100, 3520, 1.5, 5.5,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8, 1024,   8, 127,	    machine_at_ficpa2012_init, NULL			},
+    { "[VIA VP3] FIC PA-2012",			"ficpa2012",		MACHINE_TYPE_SOCKET7,		CPU_PKG_SOCKET5_7, 0, 55000000, 75000000, 2100, 3520, 1.5, 5.5,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192,1048576, 8192, 127,	    machine_at_ficpa2012_init, NULL			},
   
     /* Super Socket 7 machines */
     /* Apollo MVP3 */
-    { "[VIA MVP3] AOpen AX59 Pro",		"ax59pro",		MACHINE_TYPE_SOCKETS7,		CPU_PKG_SOCKET5_7, 0, 66666667, 124242424, 1300, 3520, 1.5, 5.5,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8, 1024,   8, 255,	      machine_at_ax59pro_init, NULL			},
+    { "[VIA MVP3] AOpen AX59 Pro",		"ax59pro",		MACHINE_TYPE_SOCKETS7,		CPU_PKG_SOCKET5_7, 0, 66666667, 124242424, 1300, 3520, 1.5, 5.5,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192,1048576, 8192, 255,	      machine_at_ax59pro_init, NULL			},
-    { "[VIA MVP3] FIC VA-503+",			"ficva503p",		MACHINE_TYPE_SOCKETS7,		CPU_PKG_SOCKET5_7, 0, 66666667, 124242424, 2000, 3200, 1.5, 5.5,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8, 1024,   8, 255,	         machine_at_mvp3_init, NULL			},
+    { "[VIA MVP3] FIC VA-503+",			"ficva503p",		MACHINE_TYPE_SOCKETS7,		CPU_PKG_SOCKET5_7, 0, 66666667, 124242424, 2000, 3200, 1.5, 5.5,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192,1048576, 8192, 255,	         machine_at_mvp3_init, NULL			},
-    { "[VIA MVP3] FIC VA-503A",			"ficva503a",		MACHINE_TYPE_SOCKETS7,		CPU_PKG_SOCKET5_7, 0, 66666667, 124242424, 1800, 3100, 1.5, 5.5,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  768,   8, 255,	    machine_at_ficva503a_init, NULL			},
+    { "[VIA MVP3] FIC VA-503A",			"ficva503a",		MACHINE_TYPE_SOCKETS7,		CPU_PKG_SOCKET5_7, 0, 66666667, 124242424, 1800, 3100, 1.5, 5.5,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 786432, 8192, 255,	    machine_at_ficva503a_init, NULL			},
 
     /* Socket 8 machines */
     /* 440FX */
-    { "[i440FX] Acer V60N",	        	"v60n",		        MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2500, 3500, 2.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  512,   8, 127,	         machine_at_v60n_init, NULL			},
+    { "[i440FX] Acer V60N",	        	"v60n",		        MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2500, 3500, 2.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 524288, 8192, 127,	         machine_at_v60n_init, NULL			},
-    { "[i440FX] ASUS P/I-P65UP5 (C-P6ND)",	"p65up5_cp6nd",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2100, 3500, 2.0, 4.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8, 1024,   8, 127,	 machine_at_p65up5_cp6nd_init, NULL			},
+    { "[i440FX] ASUS P/I-P65UP5 (C-P6ND)",	"p65up5_cp6nd",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2100, 3500, 2.0, 4.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192,1048576, 8192, 127,	 machine_at_p65up5_cp6nd_init, NULL			},
-    { "[i440FX] Biostar MB-8600TTC",		"8600ttc",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 50000000, 66666667, 2900, 3300, 2.0, 3.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8, 1024,   8, 127,	      machine_at_8500ttc_init, NULL			},
+    { "[i440FX] Biostar MB-8600TTC",		"8600ttc",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 50000000, 66666667, 2900, 3300, 2.0, 3.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192,1048576, 8192, 127,	      machine_at_8500ttc_init, NULL			},
-    { "[i440FX] Gigabyte GA-686NX",		"686nx",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2100, 3500, 2.5, 4.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  512,   8, 127,	        machine_at_686nx_init, NULL	                },
+    { "[i440FX] Gigabyte GA-686NX",		"686nx",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2100, 3500, 2.5, 4.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 524288, 8192, 127,	        machine_at_686nx_init, NULL			},
-    { "[i440FX] Intel AP440FX",			"ap440fx",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2100, 3500, 2.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  128,   8, 127,	      machine_at_ap440fx_init, NULL		        },
+    { "[i440FX] Intel AP440FX",			"ap440fx",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2100, 3500, 2.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 131072, 8192, 127,	      machine_at_ap440fx_init, NULL			},
-    { "[i440FX] Intel VS440FX",			"vs440fx",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2100, 3500, 2.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  512,   8, 127,	      machine_at_vs440fx_init, NULL		        },
+    { "[i440FX] Intel VS440FX",			"vs440fx",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2100, 3500, 2.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 524288, 8192, 127,	      machine_at_vs440fx_init, NULL			},
-    { "[i440FX] Micronics M6Mi",		"m6mi",			MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2900, 3300, 2.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  768,   8, 127,	         machine_at_m6mi_init, NULL			},
+    { "[i440FX] Micronics M6Mi",		"m6mi",			MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2900, 3300, 2.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 786432, 8192, 127,	         machine_at_m6mi_init, NULL			},
-    { "[i440FX] PC Partner MB600N",		"mb600n",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2100, 3500, 2.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  512,   8, 127,	       machine_at_mb600n_init, NULL			},
+    { "[i440FX] PC Partner MB600N",		"mb600n",		MACHINE_TYPE_SOCKET8,		CPU_PKG_SOCKET8, 0, 60000000, 66666667, 2100, 3500, 2.5, 3.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 524288, 8192, 127,	       machine_at_mb600n_init, NULL			},
 
     /* Slot 1 machines */
     /* 440FX */
-    { "[i440FX] ASUS P/I-P65UP5 (C-PKND)",	"p65up5_cpknd",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 50000000, 66666667, 1800, 3500, 2.0, 5.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8, 1024,   8, 127,	 machine_at_p65up5_cpknd_init, NULL			},
+    { "[i440FX] ASUS P/I-P65UP5 (C-PKND)",	"p65up5_cpknd",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 50000000, 66666667, 1800, 3500, 2.0, 5.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192,1048576, 8192, 127,	 machine_at_p65up5_cpknd_init, NULL			},
-    { "[i440FX] ASUS KN97",			"kn97",			MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 60000000, 83333333, 1800, 3500, 2.0, 5.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  768,   8, 127,	         machine_at_kn97_init, NULL			},
+    { "[i440FX] ASUS KN97",			"kn97",			MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 60000000, 83333333, 1800, 3500, 2.0, 5.5,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 786432, 8192, 127,	         machine_at_kn97_init, NULL			},
 
     /* 440LX */
-    { "[i440LX] ABIT LX6",			"lx6",			MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 60000000, 100000000, 1500, 3500, 2.0, 5.5,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8, 1024,   8, 255,	          machine_at_lx6_init, NULL			},
+    { "[i440LX] ABIT LX6",			"lx6",			MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 60000000, 100000000, 1500, 3500, 2.0, 5.5,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192,1048576, 8192, 255,	          machine_at_lx6_init, NULL			},
-    { "[i440LX] Micronics Spitfire",		"spitfire",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 66666667, 1800, 3500, 3.5, 6.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8, 1024,   8, 255,	     machine_at_spitfire_init, NULL			},
+    { "[i440LX] Micronics Spitfire",		"spitfire",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 66666667, 1800, 3500, 3.5, 6.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192,1048576, 8192, 255,	     machine_at_spitfire_init, NULL			},
 
     /* 440EX */
-    { "[i440EX] QDI EXCELLENT II",		"p6i440e2",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 83333333, 1800, 3500, 3.0, 8.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  512,   8, 255,	     machine_at_p6i440e2_init, NULL			},
+    { "[i440EX] QDI EXCELLENT II",		"p6i440e2",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 83333333, 1800, 3500, 3.0, 8.0,							MACHINE_PCI | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 524288, 8192, 255,	     machine_at_p6i440e2_init, NULL			},
 
     /* 440BX */
-    { "[i440BX] ASUS P2B-LS",			"p2bls",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 50000000, 112121212, 1300, 3500, 2.0, 6.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8, 1024,   8, 255,		machine_at_p2bls_init, NULL			},
+    { "[i440BX] ASUS P2B-LS",			"p2bls",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 50000000, 112121212, 1300, 3500, 2.0, 6.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192,1048576, 8192, 255,		machine_at_p2bls_init, NULL			},
-    { "[i440BX] ASUS P3B-F",			"p3bf",			MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8, 1024,   8, 255,		 machine_at_p3bf_init, NULL			},
+    { "[i440BX] ASUS P3B-F",			"p3bf",			MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192,1048576, 8192, 255,		 machine_at_p3bf_init, NULL			},
-    { "[i440BX] ABIT BF6",			"bf6",			MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 133333333, 1800, 3500, 1.5, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		  8,  768,   8, 255,		  machine_at_bf6_init, NULL			},
+    { "[i440BX] ABIT BF6",			"bf6",			MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 133333333, 1800, 3500, 1.5, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		 8192, 786432, 8192, 255,		  machine_at_bf6_init, NULL			},
-    { "[i440BX] AOpen AX6BC",			"ax6bc",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 112121212, 1800, 3500, 1.5, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		  8,  768,   8, 255,		machine_at_ax6bc_init, NULL			},
+    { "[i440BX] AOpen AX6BC",			"ax6bc",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 112121212, 1800, 3500, 1.5, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		 8192, 786432, 8192, 255,		machine_at_ax6bc_init, NULL			},
-    { "[i440BX] Gigabyte GA-686BX",		"686bx",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 100000000, 1800, 3500, 3.0, 5.5,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	 			  8, 1024,   8, 255,		machine_at_686bx_init, NULL			},
+    { "[i440BX] Gigabyte GA-686BX",		"686bx",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 100000000, 1800, 3500, 3.0, 5.5,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	 			 8192,1048576, 8192, 255,		machine_at_686bx_init, NULL			},
-    { "[i440BX] Tyan Tsunami ATX",		"tsunamiatx",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 112121212, 1800, 3500, 3.5, 5.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_SOUND,	 	  8, 1024,   8, 255,	   machine_at_tsunamiatx_init, at_tsunamiatx_get_device	},
+    { "[i440BX] Tyan Tsunami ATX",		"tsunamiatx",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 112121212, 1800, 3500, 3.5, 5.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL | MACHINE_SOUND,	 	 8192,1048576, 8192, 255,	   machine_at_tsunamiatx_init, at_tsunamiatx_get_device	},
-    { "[i440BX] SuperMicro Super P6SBA",	"p6sba",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 100000000, 1800, 3500, 3.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		  8,  768,   8, 255,	        machine_at_p6sba_init, NULL			},
+    { "[i440BX] SuperMicro Super P6SBA",	"p6sba",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 100000000, 1800, 3500, 3.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		 8192, 786432, 8192, 255,	        machine_at_p6sba_init, NULL			},
 #if defined(DEV_BRANCH) && defined(NO_SIO)
-    { "[i440BX] Fujitsu ErgoPro x365",		"ergox365",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 100000000, 1800, 3500, 3.5, 5.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  384,   8, 511,	     machine_at_ergox365_init, NULL			},
+    { "[i440BX] Fujitsu ErgoPro x365",		"ergox365",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 100000000, 1800, 3500, 3.5, 5.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 393216, 8192, 511,	     machine_at_ergox365_init, NULL			},
 #endif
 
     /* 440GX */
-    { "[i440GX] Freeway FW-6400GX",		"fw6400gx_s1",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 100000000, 150000000, 1800, 3500, 3.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 16, 2032,  16, 511,	     machine_at_fw6400gx_init, NULL			},
+    { "[i440GX] Freeway FW-6400GX",		"fw6400gx_s1",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 100000000, 150000000, 1800, 3500, 3.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				16384,2080768,16384, 511,	     machine_at_fw6400gx_init, NULL			},
 
     /* SMSC VictoryBX-66 */
-    { "[SMSC VictoryBX-66] A-Trend ATC6310BXII","atc6310bxii",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 133333333, 1300, 3500, 3.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  768,   8, 255,	  machine_at_atc6310bxii_init, NULL			},
+    { "[SMSC VictoryBX-66] A-Trend ATC6310BXII","atc6310bxii",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 133333333, 1300, 3500, 3.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 786432, 8192, 255,	  machine_at_atc6310bxii_init, NULL			},
 
     /* VIA Apollo Pro */
-    { "[VIA Apollo Pro] FIC KA-6130",		"ficka6130",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 100000000, 1800, 3500, 3.5, 5.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	 			  8,  512,   8, 255,	    machine_at_ficka6130_init, NULL			},
+    { "[VIA Apollo Pro] FIC KA-6130",		"ficka6130",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 100000000, 1800, 3500, 3.5, 5.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	 			 8192, 524288, 8192, 255,	    machine_at_ficka6130_init, NULL			},
-    { "[VIA Apollo Pro133A] ASUS P3V4X",	"p3v4x",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			  8, 2048,   8, 255,		machine_at_p3v4x_init, NULL			},
+    { "[VIA Apollo Pro133A] ASUS P3V4X",	"p3v4x",		MACHINE_TYPE_SLOT1,		CPU_PKG_SLOT1, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			 8192,2097152, 8192, 255,		machine_at_p3v4x_init, NULL			},
 
     /* Slot 2 machines */
     /* 440GX */
-    { "[i440GX] Gigabyte GA-6GXU",		"6gxu",			MACHINE_TYPE_SLOT2,		CPU_PKG_SLOT2, 0, 100000000, 133333333, 1800, 3500, 4.0, 6.5,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 16, 2048,  16, 511,	         machine_at_6gxu_init, NULL			},
+    { "[i440GX] Gigabyte GA-6GXU",		"6gxu",			MACHINE_TYPE_SLOT2,		CPU_PKG_SLOT2, 0, 100000000, 133333333, 1800, 3500, 4.0, 6.5,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		16384,2097152,16384, 511,	         machine_at_6gxu_init, NULL			},
-    { "[i440GX] Freeway FW-6400GX",		"fw6400gx",		MACHINE_TYPE_SLOT2,		CPU_PKG_SLOT2, 0, 100000000, 150000000, 1800, 3500, 3.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 16, 2032,  16, 511,	     machine_at_fw6400gx_init, NULL			},
+    { "[i440GX] Freeway FW-6400GX",		"fw6400gx",		MACHINE_TYPE_SLOT2,		CPU_PKG_SLOT2, 0, 100000000, 150000000, 1800, 3500, 3.0, 8.0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				16384,2080768,16384, 511,	     machine_at_fw6400gx_init, NULL			},
-    { "[i440GX] SuperMicro Super S2DGE",	"s2dge",		MACHINE_TYPE_SLOT2,		CPU_PKG_SLOT2, 0, 66666667, 100000000, 1800, 3500, 3.0, 7.5,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 16, 2048,  16, 511,	        machine_at_s2dge_init, NULL			},
+    { "[i440GX] SuperMicro Super S2DGE",	"s2dge",		MACHINE_TYPE_SLOT2,		CPU_PKG_SLOT2, 0, 66666667, 100000000, 1800, 3500, 3.0, 7.5,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		16384,2097152,16384, 511,	        machine_at_s2dge_init, NULL			},
 
     /* PGA370 machines */
     /* 440LX */
-    { "[i440LX] SuperMicro Super 370SLM",	"s370slm",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 100000000, 1800, 3500, MACHINE_MULTIPLIER_FIXED,				MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  768,   8, 255,	      machine_at_s370slm_init, NULL			},
+    { "[i440LX] SuperMicro Super 370SLM",	"s370slm",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 100000000, 1800, 3500, MACHINE_MULTIPLIER_FIXED,				MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 786432, 8192, 255,	      machine_at_s370slm_init, NULL			},
 
     /* 440BX */
-    { "[i440BX] AEWIN AW-O671R",		"awo671r",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 133333333, 1300, 3500, 0, 0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  512,   8, 255,	      machine_at_awo671r_init, NULL			},
+    { "[i440BX] AEWIN AW-O671R",		"awo671r",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 133333333, 1300, 3500, 0, 0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 524288, 8192, 255,	      machine_at_awo671r_init, NULL			},
-    { "[i440BX] ASUS CUBX",			"cubx",			MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8, 1024,   8, 255,		 machine_at_cubx_init, NULL			},
+    { "[i440BX] ASUS CUBX",			"cubx",			MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192,1048576, 8192, 255,		 machine_at_cubx_init, NULL			},
-    { "[i440BX] AmazePC AM-BX133",		"ambx133",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 133333333, 1300, 3500, 0, 0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  768,   8, 255,	      machine_at_ambx133_init, NULL			},
+    { "[i440BX] AmazePC AM-BX133",		"ambx133",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 133333333, 1300, 3500, 0, 0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 786432, 8192, 255,	      machine_at_ambx133_init, NULL			},
-    { "[i440BX] Tyan Trinity 371",		"trinity371",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 133333333, 1300, 3500, 3.5, 7.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8,  768,   8, 255,	   machine_at_trinity371_init, NULL			},
+    { "[i440BX] Tyan Trinity 371",		"trinity371",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 133333333, 1300, 3500, 3.5, 7.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192, 786432, 8192, 255,	   machine_at_trinity371_init, NULL			},
 
     /* 440ZX */
-    { "[i440ZX] Soltek SL-63A1",		"63a",			MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 100000000, 1800, 3500, 2.0, 7.5,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				  8,  512,   8, 255,		  machine_at_63a_init, NULL			},
+    { "[i440ZX] Soltek SL-63A1",		"63a",			MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 100000000, 1800, 3500, 2.0, 7.5,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,				 8192, 524288, 8192, 255,		  machine_at_63a_init, NULL			},
 
     /* SMSC VictoryBX-66 */
-    { "[SMSC VictoryBX-66] A-Trend ATC7020BXII","atc7020bxii",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 133333333, 1300, 3500, 3.0, 8.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		  8, 1024,   8, 255,	  machine_at_atc7020bxii_init, NULL			},
+    { "[SMSC VictoryBX-66] A-Trend ATC7020BXII","atc7020bxii",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 133333333, 1300, 3500, 3.0, 8.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 		 8192,1048576, 8192, 255,	  machine_at_atc7020bxii_init, NULL			},
 
     /* VIA Apollo Pro */
-    { "[VIA Apollo Pro] PC Partner APAS3",	"apas3",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 100000000, 1800, 3500, 3.0, 8.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			  8,  768,   8, 255,            machine_at_apas3_init, NULL			},
+    { "[VIA Apollo Pro] PC Partner APAS3",	"apas3",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 100000000, 1800, 3500, 3.0, 8.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			 8192, 786432, 8192, 255,	        machine_at_apas3_init, NULL			},
-    { "[VIA Apollo Pro133A] AEWIN WCF-681",	"wcf681",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 133333333, 1300, 3500, 0, 0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			  8, 1024,   8, 255,           machine_at_wcf681_init, NULL			},
+    { "[VIA Apollo Pro133A] AEWIN WCF-681",	"wcf681",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 133333333, 1300, 3500, 0, 0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			 8192,1048576, 8192, 255,	       machine_at_wcf681_init, NULL			},
-    { "[VIA Apollo Pro133A] ASUS CUV4X-LS",	"cuv4xls",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,						(MACHINE_AGP & ~MACHINE_AT) | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		 16, 1536,   8, 255,          machine_at_cuv4xls_init, NULL			},
+    { "[VIA Apollo Pro133A] ASUS CUV4X-LS",	"cuv4xls",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,						(MACHINE_AGP & ~MACHINE_AT) | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		16384,1572864, 8192, 255,	      machine_at_cuv4xls_init, NULL			},
-    { "[VIA Apollo Pro133A] Acorp 6VIA90AP",	"6via90ap",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 150000000, 1300, 3500, MACHINE_MULTIPLIER_FIXED,				MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			  8, 1536,   8, 255,         machine_at_6via90ap_init, NULL			},
+    { "[VIA Apollo Pro133A] Acorp 6VIA90AP",	"6via90ap",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 150000000, 1300, 3500, MACHINE_MULTIPLIER_FIXED,				MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			 8192,1572864, 8192, 255,	     machine_at_6via90ap_init, NULL			},
-    { "[VIA Apollo Pro133A] ECS P6BAP",		"p6bap",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			  8, 1536,   8, 255,            machine_at_p6bap_init, NULL			},
+    { "[VIA Apollo Pro133A] ECS P6BAP",		"p6bap",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			 8192,1572864, 8192, 255,	        machine_at_p6bap_init, NULL			},
-    { "[VIA Apollo ProMedia] Jetway 603TCF",	"603tcf",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			  8, 1024,   8, 255,           machine_at_603tcf_init, NULL			},
+    { "[VIA Apollo ProMedia] Jetway 603TCF",	"603tcf",		MACHINE_TYPE_SOCKET370,		CPU_PKG_SOCKET370, 0, 66666667, 150000000, 1300, 3500, 2.0, 8.0,						MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,	  			 8192,1048576, 8192, 255,	       machine_at_603tcf_init, NULL			},
 
     /* Miscellaneous/Fake/Hypervisor machines */
-    { "[i440BX] Microsoft Virtual PC 2007",	"vpc2007",		MACHINE_TYPE_MISC,		CPU_PKG_SLOT1, CPU_PENTIUM2 | CPU_CYRIX3S, 0, 0, 0, 0, 0, 0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		  8, 1024,   8, 255,	      machine_at_vpc2007_init, NULL			},
+    { "[i440BX] Microsoft Virtual PC 2007",	"vpc2007",		MACHINE_TYPE_MISC,		CPU_PKG_SLOT1, CPU_PENTIUM2 | CPU_CYRIX3S, 0, 0, 0, 0, 0, 0,							MACHINE_AGP | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL,		  		 8192,1048576, 8192, 255,	      machine_at_vpc2007_init, NULL			},
 
     { NULL,					NULL,			MACHINE_TYPE_NONE,		0, 0, 0, 0, 0, 0, 0, 0,												0,										    0,      0,    0,   0,			         NULL, NULL			}
 };

src/mem/spd.c

@@ -345,7 +345,7 @@ spd_write_drbs(uint8_t *regs, uint8_t reg_min, uint8_t reg_max, uint8_t drb_unit
     /* No SPD: split SIMMs into pairs as if they were "DIMM"s. */
     if (!spd_present) {
 	dimm = ((reg_max - reg_min) + 1) >> 1; /* amount of "DIMM"s, also used to determine the maximum "DIMM" size */
-	spd_populate(rows, dimm, mem_size >> 10, drb_unit, 1 << (log2i(machines[machine].max_ram / dimm)), 0);
+	spd_populate(rows, dimm, mem_size >> 10, drb_unit, 1 << (log2i((machines[machine].max_ram >> 10) / dimm)), 0);
     }
 
     /* Write DRBs for each row. */

src/pc.c

@@ -809,7 +809,7 @@ pc_reset_hard_init(void)
     /* Reset and reconfigure the Network Card layer. */
     network_reset();
 
-    if (joystick_type != JOYSTICK_TYPE_NONE)
+    if (joystick_type)
 	gameport_update_joystick_type();
 
     ui_sb_update_panes();

src/scsi/scsi_ncr5380.c

@@ -376,7 +376,8 @@ ncr_bus_update(void *priv, int bus)
     if (bus & BUS_ARB)
 	ncr->state = STATE_IDLE;
 
-    if (ncr->state == STATE_IDLE) {
+    switch (ncr->state) {
+	case STATE_IDLE:
 		ncr->clear_req = ncr->wait_data = ncr->wait_complete = 0;
 		if ((bus & BUS_SEL) && !(bus & BUS_BSY)) {
 			ncr_log("Selection phase\n");
@@ -395,7 +396,8 @@ ncr_bus_update(void *priv, int bus)
 				ncr->cur_bus = 0;
 			}
 		}
-	} else if (ncr->state == STATE_SELECT) {
+		break;
+	case STATE_SELECT:
 		if (!(bus & BUS_SEL)) {
 			if (!(bus & BUS_ATN)) {
 				if ((ncr->target_id != (uint8_t)-1) && scsi_device_present(&scsi_devices[ncr->target_id])) {
@@ -418,7 +420,8 @@ ncr_bus_update(void *priv, int bus)
 				ncr->is_msgout = 1;
 			}
 		}
-    } else if (ncr->state == STATE_COMMAND) {
+		break;
+	case STATE_COMMAND:
 		if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
 			/*Write command byte to the output data register*/
 			ncr->command[ncr->command_pos++] = BUS_GETDATA(bus);
@@ -464,7 +467,8 @@ ncr_bus_update(void *priv, int bus)
 				ncr->new_phase = dev->phase;
 			}
 		}
-    } else if (ncr->state == STATE_DATAIN) {
+		break;
+	case STATE_DATAIN:
 		dev = &scsi_devices[ncr->target_id];
 		if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
 			if (ncr->data_pos >= dev->buffer_length) {
@@ -487,7 +491,8 @@ ncr_bus_update(void *priv, int bus)
 				ncr->new_phase = SCSI_PHASE_DATA_IN;
 			}
 		}
-    } else if (ncr->state == STATE_DATAOUT) {
+		break;
+	case STATE_DATAOUT:
 		dev = &scsi_devices[ncr->target_id];
 
 		if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
@@ -510,7 +515,8 @@ ncr_bus_update(void *priv, int bus)
 				ncr_log("CurBus ~REQ_DataOut=%02x\n", ncr->cur_bus);
 			}
 		}
-    } else if (ncr->state == STATE_STATUS) {
+		break;
+	case STATE_STATUS:
 		if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
 			/*All transfers done, wait until next transfer*/
 			ncr->cur_bus &= ~BUS_REQ;
@@ -518,13 +524,15 @@ ncr_bus_update(void *priv, int bus)
 			ncr->wait_data = 4;
 			ncr->wait_complete = 8;	
 		}
-    } else if (ncr->state == STATE_MESSAGEIN) {
+		break;
+	case STATE_MESSAGEIN:
 		if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
 			ncr->cur_bus &= ~BUS_REQ;
 			ncr->new_phase = BUS_IDLE;
 			ncr->wait_data = 4;
 		}
-    } else if (ncr->state == STATE_MESSAGEOUT) {
+		break;
+	case STATE_MESSAGEOUT:
 		ncr_log("Ack on MSGOUT = %02x\n", (bus & BUS_ACK));
 		if ((bus & BUS_ACK) && !(ncr->bus_in & BUS_ACK)) {
 			ncr->msgout[ncr->msgout_pos++] = BUS_GETDATA(bus);
@@ -536,7 +544,8 @@ ncr_bus_update(void *priv, int bus)
 				ncr->state = STATE_MESSAGE_ID;
 			}
 		}
-	} else if (ncr->state == STATE_MESSAGE_ID) {
+		break;
+	case STATE_MESSAGE_ID:
 		if ((ncr->target_id != (uint8_t)-1) && scsi_device_present(&scsi_devices[ncr->target_id])) {
 			ncr_log("Device found at ID %i on MSGOUT, Current Bus BSY=%02x\n", ncr->target_id, ncr->cur_bus);
 			ncr->state = STATE_COMMAND;
@@ -545,6 +554,7 @@ ncr_bus_update(void *priv, int bus)
 			ncr->command_pos = 0;
 			SET_BUS_STATE(ncr, SCSI_PHASE_COMMAND);
 		}
+		break;
     }
 
     ncr->bus_in = bus;

src/video/vid_ogc.c

@@ -0,0 +1,693 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Emulation of the Olivetti OGC 8-bit ISA (GO708) and 
+ *      M21/M24/M28 16-bit bus (GO317/318/380/709) video cards.
+ *
+ *
+ *
+ * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
+ *		Miran Grca, <mgrca8@gmail.com>
+ *		Fred N. van Kempen, <decwiz@yahoo.com>
+ *		EngiNerd, <webmaster.crrc@yahoo.it>
+ *
+ *		Copyright 2008-2019 Sarah Walker.
+ *		Copyright 2016-2019 Miran Grca.
+ *		Copyright 2017-2019 Fred N. van Kempen.
+ *		Copyright 2020 EngiNerd.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <wchar.h>
+#include <86box/io.h>
+#include <86box/video.h>
+#include <86box/86box.h>
+#include <86box/timer.h>
+#include <86box/mem.h>
+#include <86box/pit.h>
+#include <86box/rom.h>
+#include <86box/device.h>
+#include <86box/vid_cga.h>
+#include <86box/vid_ogc.h>
+#include <86box/vid_cga_comp.h>
+
+
+
+/*
+ * Current bugs: 
+ * - Olivetti diagnostics fail with errors: 6845 crtc write / read error out 0000 in 00ff
+ * - Dark blue (almost black) picture in composite mode
+ */
+
+#define CGA_RGB 0
+#define CGA_COMPOSITE 1
+
+#define COMPOSITE_OLD 0
+#define COMPOSITE_NEW 1
+
+
+
+static video_timings_t timing_ogc      = {VIDEO_ISA, 8,16,32, 8,16,32};
+
+static uint8_t		mdaattr[256][2][2];
+
+void
+ogc_recalctimings(ogc_t *ogc)
+{
+    double _dispontime, _dispofftime, disptime;
+
+    if (ogc->cga.cgamode & 1) {
+	disptime    = ogc->cga.crtc[0] + 1;
+	_dispontime = ogc->cga.crtc[1];
+    } else {
+	disptime    = (ogc->cga.crtc[0] + 1) << 1;
+	_dispontime = ogc->cga.crtc[1] << 1;
+    }
+
+    _dispofftime = disptime - _dispontime;
+    _dispontime  *= CGACONST / 2;
+    _dispofftime *= CGACONST / 2;
+    ogc->cga.dispontime  = (uint64_t)(_dispontime);
+    ogc->cga.dispofftime = (uint64_t)(_dispofftime);
+}
+
+void
+ogc_out(uint16_t addr, uint8_t val, void *priv)
+{
+    ogc_t *ogc = (ogc_t *)priv;
+
+	// if (addr >= 0x3c0 && addr <= 0x3cf){
+	// 	addr = addr + 16;
+	// }
+
+    switch (addr) {
+	case 0x3d4:
+	case 0x3d5:
+	case 0x3d8:
+	case 0x3d9:
+		cga_out(addr, val, &ogc->cga);
+		break;
+
+	case 0x3de:
+		/* set control register */
+		ogc->ctrl_3de = val;
+		/* select 1st or 2nd 16k vram block to be used */
+		ogc->base = (val & 0x08) ? 0x4000 : 0;
+		break;
+	}
+}
+
+uint8_t
+ogc_in(uint16_t addr, void *priv)
+{
+    ogc_t *ogc = (ogc_t *)priv;
+
+	// if (addr >= 0x3c0 && addr <= 0x3cf){
+	// 	addr = addr + 16;
+	// }
+
+    uint8_t ret = 0xff;
+
+    switch (addr) {
+	case 0x3d4:
+	case 0x3d5:
+	case 0x3da:
+		/* 
+		 * bits 6-7: 3 = no DEB expansion board installed
+		 * bits 4-5: 2 color, 3 mono
+		 * bit 3: high during 1st half of vertical retrace in character mode (CCA standard)
+		 * bit 2: lightpen switch (CGA standard)
+		 * bit 1: lightpen strobe (CGA standard)
+		 * bit 0: high during retrace (CGA standard)
+		 */
+		ret = cga_in(addr, &ogc->cga);
+		ret = ret | 0xe0;
+		if (ogc->mono_display)
+			ret = ret | 0x10;
+		break;
+	}
+
+    return(ret);
+}
+
+
+void
+ogc_waitstates(void *p)
+{
+    int ws_array[16] = {3, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8, 4, 5, 6, 7, 8};
+    int ws;
+
+    ws = ws_array[cycles & 0xf];
+    sub_cycles(ws);
+}
+
+
+void
+ogc_write(uint32_t addr, uint8_t val, void *priv)
+{
+    ogc_t *ogc = (ogc_t *)priv;
+	int offset;
+
+    ogc->cga.vram[addr & 0x7FFF]=val;
+	if (ogc->cga.snow_enabled) {
+		/* recreate snow effect */
+		offset = ((timer_get_remaining_u64(&ogc->cga.timer) / CGACONST) * 4) & 0xfc;
+		ogc->cga.charbuffer[offset] = ogc->cga.vram[addr & 0x7fff];
+		ogc->cga.charbuffer[offset | 1] = ogc->cga.vram[addr & 0x7fff];
+	}
+	egawrites++;
+    ogc_waitstates(&ogc->cga);
+}
+
+uint8_t
+ogc_read(uint32_t addr, void *priv)
+{
+    
+	ogc_t *ogc = (ogc_t *)priv;
+    int offset;
+
+	ogc_waitstates(&ogc->cga);
+
+	if (ogc->cga.snow_enabled) {
+		/* recreate snow effect */
+		offset = ((timer_get_remaining_u64(&ogc->cga.timer) / CGACONST) * 4) & 0xfc;
+		ogc->cga.charbuffer[offset] = ogc->cga.vram[addr & 0x7fff];
+		ogc->cga.charbuffer[offset | 1] = ogc->cga.vram[addr & 0x7fff];
+	}
+	
+	egareads++;
+    return(ogc->cga.vram[addr & 0x7FFF]);
+}
+
+void
+ogc_poll(void *priv)
+{
+    ogc_t *ogc = (ogc_t *)priv;
+    uint16_t ca = (ogc->cga.crtc[15] | (ogc->cga.crtc[14] << 8)) & 0x3fff;
+    int drawcursor;
+    int x, c, xs_temp, ys_temp;
+    int oldvc;
+    uint8_t chr, attr;
+    uint16_t dat, dat2;
+    int cols[4];
+    int oldsc;
+	int blink = 0;
+	int underline = 0;
+	uint8_t border;
+    
+	//composito colore appare blu scuro
+
+	/* graphic mode and not mode 40h */
+	if (!(ogc->ctrl_3de & 0x1 || !(ogc->cga.cgamode & 2))) {
+		/* standard cga mode */
+		cga_poll(&ogc->cga);
+		return;
+	} else {
+		/* mode 40h or text mode */
+		if (!ogc->cga.linepos) {
+			timer_advance_u64(&ogc->cga.timer, ogc->cga.dispofftime);
+			ogc->cga.cgastat |= 1;
+			ogc->cga.linepos = 1;
+			oldsc = ogc->cga.sc;
+			if ((ogc->cga.crtc[8] & 3) == 3) 
+				ogc->cga.sc = ((ogc->cga.sc << 1) + ogc->cga.oddeven) & 7;
+			if (ogc->cga.cgadispon) {
+				if (ogc->cga.displine < ogc->cga.firstline) {
+					ogc->cga.firstline = ogc->cga.displine;
+					video_wait_for_buffer();
+				}
+				ogc->cga.lastline = ogc->cga.displine;
+				/* 80-col */
+				if (ogc->cga.cgamode & 1) {
+					/* for each text column */
+					for (x = 0; x < ogc->cga.crtc[1]; x++) {
+						/* video output enabled */
+						if (ogc->cga.cgamode & 8) {	
+							/* character */
+							chr = ogc->cga.charbuffer[x << 1];
+							/* text attributes */
+							attr = ogc->cga.charbuffer[(x << 1) + 1];
+						} else
+							chr = attr = 0;
+						/* check if cursor has to be drawn */
+						drawcursor = ((ogc->cga.ma == ca) && ogc->cga.con && ogc->cga.cursoron);
+						/* check if character underline mode should be set */
+						underline = ((ogc->ctrl_3de & 0x40) && (attr & 0x1) && !(attr & 0x6));
+						if (underline) {
+							/* set forecolor to white */
+							attr = attr | 0x7;
+						}
+						blink = 0;
+						/* set foreground */
+						cols[1] = (attr & 15) + 16;
+						/* blink active */
+						if (ogc->cga.cgamode & 0x20) {
+							cols[0] = ((attr >> 4) & 7) + 16;
+							/* attribute 7 active and not cursor */
+							if ((ogc->cga.cgablink & 8) && (attr & 0x80) && !ogc->cga.drawcursor) {
+								/* set blinking */
+								cols[1] = cols[0];
+								blink = 1;
+							}
+						} else {
+							/* Set intensity bit */
+							cols[0] = (attr >> 4) + 16;
+							blink = (attr & 0x80) * 8 + 7 + 16;
+						}
+						/* character underline active and 7th row of pixels in character height being drawn */
+						if (underline && (ogc->cga.sc == 7)) {
+							/* for each pixel in character width */
+							for (c = 0; c < 8; c++) 
+								buffer32->line[ogc->cga.displine][(x << 3) + c + 8] = mdaattr[attr][blink][1];
+						} else if (drawcursor) {
+							for (c = 0; c < 8; c++) 
+								buffer32->line[ogc->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr][((ogc->cga.sc & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+						} else {
+							for (c = 0; c < 8; c++) 
+								buffer32->line[ogc->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr][((ogc->cga.sc & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0];
+						}
+						
+						ogc->cga.ma++;
+					}
+				} 
+				/* 40-col */
+				else if (!(ogc->cga.cgamode & 2)) {
+					for (x = 0; x < ogc->cga.crtc[1]; x++) {
+						if (ogc->cga.cgamode & 8) {
+							chr  = ogc->cga.vram[((ogc->cga.ma << 1) & 0x3fff) + ogc->base];
+							attr = ogc->cga.vram[(((ogc->cga.ma << 1) + 1) & 0x3fff) + ogc->base];
+						} else {
+							chr = attr = 0;
+						}
+						drawcursor = ((ogc->cga.ma == ca) && ogc->cga.con && ogc->cga.cursoron);
+						/* check if character underline mode should be set */
+						underline = ((ogc->ctrl_3de & 0x40) && (attr & 0x1) && !(attr & 0x6));
+						if (underline) {
+							/* set forecolor to white */
+							attr = attr | 0x7;
+						}
+						blink = 0;
+						/* set foreground */
+						cols[1] = (attr & 15) + 16;
+						/* blink active */
+						if (ogc->cga.cgamode & 0x20) {
+							cols[0] = ((attr >> 4) & 7) + 16;
+							if ((ogc->cga.cgablink & 8) && (attr & 0x80) && !ogc->cga.drawcursor) {
+								/* set blinking */
+								cols[1] = cols[0];
+								blink = 1;
+							}
+						} else {
+							/* Set intensity bit */
+							cols[0] = (attr >> 4) + 16;
+							blink = (attr & 0x80) * 8 + 7 + 16;
+						}
+
+						
+						/* character underline active and 7th row of pixels in character height being drawn */
+						if (underline && (ogc->cga.sc == 7)) {
+							/* for each pixel in character width */
+							for (c = 0; c < 8; c++) 
+								buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 8] = 
+								buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 1 + 8] = mdaattr[attr][blink][1];
+						} else if (drawcursor) {
+							for (c = 0; c < 8; c++)
+								buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 8] = 
+								buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((ogc->cga.sc & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+						} else {
+							for (c = 0; c < 8; c++)
+								buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 8] = 
+								buffer32->line[ogc->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][((ogc->cga.sc & 7) << 1) | ogc->lineff] & (1 << (c ^ 7))) ? 1 : 0];
+						}
+						
+						ogc->cga.ma++;
+						
+					}
+				} else {
+					/* 640x400 mode */
+					if (ogc->ctrl_3de & 1 ) {
+						dat2 = ((ogc->cga.sc & 1) * 0x4000) | (ogc->lineff * 0x2000);
+						cols[0] = 0; cols[1] = 15 + 16;
+					} 
+					else {
+						dat2 = (ogc->cga.sc & 1) * 0x2000;
+						cols[0] = 0; cols[1] = (ogc->cga.cgacol & 15) + 16;
+					}
+					
+					for (x = 0; x < ogc->cga.crtc[1]; x++) {
+						/* video out */
+						if (ogc->cga.cgamode & 8) {
+							dat = (ogc->cga.vram[((ogc->cga.ma << 1) & 0x1fff) + dat2] << 8) | ogc->cga.vram[((ogc->cga.ma << 1) & 0x1fff) + dat2 + 1];
+						} else {
+							dat = 0;
+						}
+						ogc->cga.ma++;
+						
+						for (c = 0; c < 16; c++) {
+							buffer32->line[ogc->cga.displine][(x << 4) + c + 8] = cols[dat >> 15];
+							dat <<= 1;
+						}
+					}
+				}
+			} else {
+				
+				/* ogc specific */
+				cols[0] = ((ogc->cga.cgamode & 0x12) == 0x12) ? 0 : (ogc->cga.cgacol & 15) + 16;
+				if (ogc->cga.cgamode & 1) {
+					hline(buffer32, 0, (ogc->cga.displine << 1), ((ogc->cga.crtc[1] << 3) + 16) << 2, cols[0]);
+					hline(buffer32, 0, (ogc->cga.displine << 1) + 1, ((ogc->cga.crtc[1] << 3) + 16) << 2, cols[0]);
+				} else {
+					hline(buffer32, 0, (ogc->cga.displine << 1), ((ogc->cga.crtc[1] << 4) + 16) << 2, cols[0]);
+					hline(buffer32, 0, (ogc->cga.displine << 1) + 1, ((ogc->cga.crtc[1] << 4) + 16) << 2, cols[0]);
+				}
+				
+			}
+
+			/* 80 columns */
+			if (ogc->cga.cgamode & 1)
+				x = (ogc->cga.crtc[1] << 3) + 16;
+			else
+				x = (ogc->cga.crtc[1] << 4) + 16;
+
+			if (ogc->cga.composite) {
+				if (ogc->cga.cgamode & 0x10)
+					border = 0x00;
+				else
+					border = ogc->cga.cgacol & 0x0f;
+
+				Composite_Process(ogc->cga.cgamode, border, x >> 2, buffer32->line[(ogc->cga.displine << 1)]);
+				Composite_Process(ogc->cga.cgamode, border, x >> 2, buffer32->line[(ogc->cga.displine << 1) + 1]);
+			}
+
+
+			ogc->cga.sc = oldsc;
+			if (ogc->cga.vc == ogc->cga.crtc[7] && !ogc->cga.sc)
+				ogc->cga.cgastat |= 8;
+			ogc->cga.displine++;
+			if (ogc->cga.displine >= 720) 
+				ogc->cga.displine = 0;
+		} else {
+			timer_advance_u64(&ogc->cga.timer, ogc->cga.dispontime);
+			if (ogc->cga.cgadispon) ogc->cga.cgastat &= ~1;
+			ogc->cga.linepos = 0;
+			/* ogc specific */
+			ogc->lineff ^= 1;
+			if (ogc->lineff) {
+				ogc->cga.ma = ogc->cga.maback;
+			} else {
+				if (ogc->cga.vsynctime) {
+					ogc->cga.vsynctime--;
+					if (!ogc->cga.vsynctime)
+					ogc->cga.cgastat &= ~8;
+				}
+				if (ogc->cga.sc == (ogc->cga.crtc[11] & 31) || ((ogc->cga.crtc[8] & 3) == 3 && ogc->cga.sc == ((ogc->cga.crtc[11] & 31) >> 1))) { 
+					ogc->cga.con = 0; 
+					ogc->cga.coff = 1; 
+				}
+				if ((ogc->cga.crtc[8] & 3) == 3 && ogc->cga.sc == (ogc->cga.crtc[9] >> 1))
+					ogc->cga.maback = ogc->cga.ma;
+				if (ogc->cga.vadj) {
+					ogc->cga.sc++;
+					ogc->cga.sc &= 31;
+					ogc->cga.ma = ogc->cga.maback;
+					ogc->cga.vadj--;
+					if (!ogc->cga.vadj) {
+						ogc->cga.cgadispon = 1;
+						ogc->cga.ma = ogc->cga.maback = (ogc->cga.crtc[13] | (ogc->cga.crtc[12] << 8)) & 0x3fff;
+						ogc->cga.sc = 0;
+					}
+				} else if (ogc->cga.sc == ogc->cga.crtc[9] || ((ogc->cga.crtc[8] & 3) == 3 && ogc->cga.sc == (ogc->cga.crtc[9] >> 1))) {
+					ogc->cga.maback = ogc->cga.ma;
+					ogc->cga.sc = 0;
+					oldvc = ogc->cga.vc;
+					ogc->cga.vc++;
+					ogc->cga.vc &= 127;
+
+					if (ogc->cga.vc == ogc->cga.crtc[6]) 
+						ogc->cga.cgadispon=0;
+
+					if (oldvc == ogc->cga.crtc[4]) {
+					ogc->cga.vc = 0;
+					ogc->cga.vadj = ogc->cga.crtc[5];
+						if (!ogc->cga.vadj) {
+							ogc->cga.cgadispon = 1;
+							ogc->cga.ma = ogc->cga.maback = (ogc->cga.crtc[13] | (ogc->cga.crtc[12] << 8)) & 0x3fff;
+						}
+						switch (ogc->cga.crtc[10] & 0x60) {
+							case 0x20:
+								ogc->cga.cursoron = 0;
+								break;
+							case 0x60:
+								ogc->cga.cursoron = ogc->cga.cgablink & 0x10;
+								break;
+							default:
+								ogc->cga.cursoron = ogc->cga.cgablink & 0x08;
+								break;
+						}
+					}
+					if (ogc->cga.vc == ogc->cga.crtc[7]) {
+						ogc->cga.cgadispon = 0;
+						ogc->cga.displine = 0;
+						/* ogc specific */
+						ogc->cga.vsynctime = (ogc->cga.crtc[3] >> 4) + 1;
+						if (ogc->cga.crtc[7]) {
+							if (ogc->cga.cgamode & 1)
+								x = (ogc->cga.crtc[1] << 3) + 16;
+							else
+								x = (ogc->cga.crtc[1] << 4) + 16;
+							ogc->cga.lastline++;
+
+							xs_temp = x;
+							ys_temp = (ogc->cga.lastline - ogc->cga.firstline);
+
+							if ((xs_temp > 0) && (ys_temp > 0)) {
+								if (xsize < 64) xs_temp = 656;
+								/* ogc specific */
+								if (ysize < 32) ys_temp = 200;
+								if (!enable_overscan)
+									xs_temp -= 16;
+
+								
+								if ((ogc->cga.cgamode & 8) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) {
+									xsize = xs_temp;
+									ysize = ys_temp;
+									set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
+
+									if (video_force_resize_get())
+										video_force_resize_set(0);
+								}
+								/* ogc specific */
+								if (enable_overscan) {
+									if (ogc->cga.composite) 
+										video_blit_memtoscreen(0, (ogc->cga.firstline - 8), 0, (ogc->cga.lastline - ogc->cga.firstline) + 16,
+												xsize, (ogc->cga.lastline - ogc->cga.firstline) + 16);
+									else
+										video_blit_memtoscreen_8(0, (ogc->cga.firstline - 8), 0, (ogc->cga.lastline - ogc->cga.firstline) + 16,
+												xsize, (ogc->cga.lastline - ogc->cga.firstline) + 16);
+								} else {
+									if (ogc->cga.composite) 
+										video_blit_memtoscreen(8, ogc->cga.firstline, 0, (ogc->cga.lastline - ogc->cga.firstline),
+												xsize, (ogc->cga.lastline - ogc->cga.firstline));
+									else
+										video_blit_memtoscreen_8(8, ogc->cga.firstline, 0, (ogc->cga.lastline - ogc->cga.firstline),
+												xsize, (ogc->cga.lastline - ogc->cga.firstline));
+								}
+							}
+							frames++;
+
+							video_res_x = xsize;
+							video_res_y = ysize;
+							/* 80-col */
+							if (ogc->cga.cgamode & 1) {
+								video_res_x /= 8;
+								video_res_y /= (ogc->cga.crtc[9] + 1) * 2;
+								video_bpp = 0;
+							/* 40-col */
+							} else if (!(ogc->cga.cgamode & 2)) {
+								video_res_x /= 16;
+								video_res_y /= (ogc->cga.crtc[9] + 1) * 2;
+								video_bpp = 0;
+							} else if (!(ogc->ctrl_3de & 1)) {
+								video_res_y /= 2;
+								video_bpp = 1;
+							}
+						}
+						ogc->cga.firstline = 1000;
+						ogc->cga.lastline = 0;
+						ogc->cga.cgablink++;
+						ogc->cga.oddeven ^= 1;
+					}
+				} else {
+					ogc->cga.sc++;
+					ogc->cga.sc &= 31;
+					ogc->cga.ma = ogc->cga.maback;
+				}
+
+				if (ogc->cga.cgadispon)
+					ogc->cga.cgastat &= ~1;
+				
+				if ((ogc->cga.sc == (ogc->cga.crtc[10] & 31) || ((ogc->cga.crtc[8] & 3) == 3 && ogc->cga.sc == ((ogc->cga.crtc[10] & 31) >> 1)))) 
+					ogc->cga.con = 1;
+			}
+			/* 80-columns */
+			if (ogc->cga.cgadispon && (ogc->cga.cgamode & 1)) {
+				for (x = 0; x < (ogc->cga.crtc[1] << 1); x++)
+					ogc->cga.charbuffer[x] = ogc->cga.vram[(((ogc->cga.ma << 1) + x) & 0x3fff) + ogc->base];
+			}
+		}
+	}
+}
+
+void
+ogc_close(void *priv)
+{
+    ogc_t *ogc = (ogc_t *)priv;
+
+    free(ogc->cga.vram);
+    free(ogc);
+}
+
+void
+ogc_speed_changed(void *priv)
+{
+    ogc_t *ogc = (ogc_t *)priv;
+
+    ogc_recalctimings(ogc);
+}
+
+void
+ogc_mdaattr_rebuild(){
+	int c;
+    
+	for (c = 0; c < 256; c++) {
+		mdaattr[c][0][0] = mdaattr[c][1][0] = mdaattr[c][1][1] = 16;
+		if (c & 8)	mdaattr[c][0][1] = 15 + 16;
+		else		mdaattr[c][0][1] =  7 + 16;
+	}
+
+	mdaattr[0x70][0][1] = 16;
+	mdaattr[0x70][0][0] = mdaattr[0x70][1][0] = mdaattr[0x70][1][1] = 16 + 15;
+	mdaattr[0xF0][0][1] = 16;
+	mdaattr[0xF0][0][0] = mdaattr[0xF0][1][0] = mdaattr[0xF0][1][1] = 16 + 15;
+	mdaattr[0x78][0][1] = 16 + 7;
+	mdaattr[0x78][0][0] = mdaattr[0x78][1][0] = mdaattr[0x78][1][1] = 16 + 15;
+	mdaattr[0xF8][0][1] = 16 + 7;
+	mdaattr[0xF8][0][0] = mdaattr[0xF8][1][0] = mdaattr[0xF8][1][1] = 16 + 15;
+	mdaattr[0x00][0][1] = mdaattr[0x00][1][1] = 16;
+	mdaattr[0x08][0][1] = mdaattr[0x08][1][1] = 16;
+	mdaattr[0x80][0][1] = mdaattr[0x80][1][1] = 16;
+	mdaattr[0x88][0][1] = mdaattr[0x88][1][1] = 16;
+}
+
+/* 
+ * Missing features
+ * - Composite video mode not working
+ * - Optional EGC expansion board (which handles 640x400x16) not implemented
+ */
+void *
+ogc_init(const device_t *info)
+{
+    // int display_type;
+	ogc_t *ogc = (ogc_t *)malloc(sizeof(ogc_t));
+
+    memset(ogc, 0x00, sizeof(ogc_t));
+    video_inform(VIDEO_FLAG_TYPE_CGA, &timing_ogc);
+
+    loadfont(L"roms/video/ogc/ogc graphics board go380 258 pqbq.bin", 1);
+    
+	/* composite is not working yet */
+	// display_type = device_get_config_int("display_type");
+    ogc->cga.composite = 0; // (display_type != CGA_RGB);
+    ogc->cga.revision = device_get_config_int("composite_type");
+    ogc->cga.snow_enabled = device_get_config_int("snow_enabled");
+	
+	ogc->cga.vram = malloc(0x8000);
+
+	cga_comp_init(ogc->cga.revision);
+    timer_add(&ogc->cga.timer, ogc_poll, ogc, 1);
+    mem_mapping_add(&ogc->cga.mapping, 0xb8000, 0x08000,
+		    ogc_read, NULL, NULL,
+		    ogc_write, NULL, NULL,  NULL, 0, ogc);
+    io_sethandler(0x03d0, 16, ogc_in, NULL, NULL, ogc_out, NULL, NULL, ogc);
+    
+    overscan_x = overscan_y = 16;
+    ogc->cga.rgb_type = device_get_config_int("rgb_type");
+    cga_palette = (ogc->cga.rgb_type << 1);
+    cgapal_rebuild();
+	ogc_mdaattr_rebuild();
+	    
+	/* color display */
+	if (device_get_config_int("rgb_type")==0 || device_get_config_int("rgb_type") == 4) 
+		ogc->mono_display = 0;
+	else
+		ogc->mono_display = 1;    
+
+    return ogc;
+}
+
+
+const device_config_t ogc_m24_config[] =
+{
+        {
+                /* Olivetti / ATT compatible displays */
+				"rgb_type", "RGB type", CONFIG_SELECTION, "", CGA_RGB, "", { 0 },
+                {
+                        {
+                                "Color", 0
+                        },
+                        {
+                                "Green Monochrome", 1
+                        },
+                        {
+                                "Amber Monochrome", 2
+                        },
+                        {
+                                "Gray Monochrome", 3
+                        },
+                        {
+                                ""
+                        }
+                }
+        },
+        {
+                "snow_enabled", "Snow emulation", CONFIG_BINARY, "", 1,
+        },
+        {
+                "", "", -1
+        }
+};
+
+const device_t ogc_m24_device =
+{
+	"Olivetti M21/M24/M28 (GO317/318/380/709) video card",
+	DEVICE_ISA, 0,
+	ogc_init,
+	ogc_close,
+	NULL,
+	{ NULL },
+	ogc_speed_changed,
+	NULL,
+	ogc_m24_config
+};
+
+const device_t ogc_device =
+{
+	"Olivetti OGC (GO708)",
+	DEVICE_ISA, 0,
+	ogc_init,
+	ogc_close,
+	NULL,
+	{ NULL },
+	ogc_speed_changed,
+	NULL,
+	cga_config
+};

src/video/vid_table.c

@@ -177,6 +177,7 @@ video_cards[] = {
     { "virge375_vbe20_vlb",	&s3_virge_375_4_vlb_device		},
     { "tgui9400cxi_vlb",	&tgui9400cxi_device			},
     { "tgui9440_vlb",		&tgui9440_vlb_device			},
+    { "ogc",        		&ogc_device				},
     { "",			NULL                        		}
 };
 

src/video/video.c

@@ -1038,6 +1038,20 @@ loadfont(wchar_t *s, int format)
 		for (c = 0; c < 256; c++)
 			fread(&fontdat12x18[c][0], 1, 36, f);
 		break;
+
+    case 10:		/* Olivetti M19 */
+		fseek(f, 90, SEEK_SET);
+		for (d = 0; d < 4; d++) {
+			/* There are 4 fonts in the ROM */
+			for (c = 0; c < 256; c++)	/* 8x14 MDA in 8x16 cell */
+				fread(&fontdatm[256*d + c][0], 1, 16, f);
+			for (c = 0; c < 256; c++) {	/* 8x8 CGA in 8x16 cell */
+				fread(&fontdat[256*d + c][0], 1, 8, f);
+				fseek(f, 8, SEEK_CUR);
+			}
+		}
+		break;
+
 	}
 
     (void)fclose(f);

src/win/86Box.rc

@@ -294,7 +294,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,57,24,50,14
     CONTROL         "Gain",IDC_SLIDER_GAIN,"msctls_trackbar32",TBS_VERT | 
                     TBS_BOTH | TBS_AUTOTICKS | WS_TABSTOP,15,20,20,109
-    CTEXT           "Gain",IDT_1746,16,7,32,9,SS_CENTERIMAGE
+    CTEXT           "Gain",IDT_1746,10,7,32,9,SS_CENTERIMAGE
 END
 
 DLG_NEW_FLOPPY DIALOG DISCARDABLE  0, 0, 226, 86
@@ -302,12 +302,12 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "New Image"
 FONT 9, "Segoe UI"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,74,65,50,14
+    DEFPUSHBUTTON   "OK",IDOK,104,65,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,129,65,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,162,65,50,14
     LTEXT           "File name:",IDT_1749,7,6,44,12,SS_CENTERIMAGE
     LTEXT           "Disk size:",IDT_1750,7,25,44,12,SS_CENTERIMAGE
     LTEXT           "RPM mode:",IDT_1751,7,45,44,12,SS_CENTERIMAGE
-    EDITTEXT        IDC_EDIT_FILE_NAME,53,5,154,14,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_EDIT_FILE_NAME,53,5,150,14,ES_AUTOHSCROLL | ES_READONLY
     COMBOBOX        IDC_COMBO_DISK_SIZE,53,25,166,14,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_COMBO_RPM_MODE,53,45,166,14,CBS_DROPDOWNLIST | 

src/win/Makefile.mingw

@@ -33,9 +33,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef DEV_BRANCH
   DEV_BRANCH	:= y
  endif
- ifndef 596B
-  596B		:= y
- endif
  ifndef AMD_K5
   AMD_K5	:= y
  endif
@@ -96,12 +93,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef XL24
   XL24		:= y
  endif
- ifndef NO_SIO
-  NO_SIO	:= y
- endif
- ifndef GUSMAX
-  GUSMAX	:= y
- endif
  ifndef USE_VECT486VL
   USE_VECT486VL	:= y
  endif
@@ -115,9 +106,6 @@ else
  ifndef DEV_BRANCH
   DEV_BRANCH	:= n
  endif
- ifndef 596B
-  596B		:= n
- endif
  ifndef AMD_K5
   AMD_K5	:= n
  endif
@@ -178,12 +166,6 @@ else
  ifndef XL24
   XL24		:= n
  endif
- ifndef NO_SIO
-  NO_SIO	:= n
- endif
- ifndef GUSMAX
-  GUSMAX	:= n
- endif
  ifndef USE_VECT486VL
   USE_VECT486VL	:= n
  endif
@@ -513,6 +495,10 @@ ifeq ($(CYRIX_6X86), y)
 OPTS		+= -DUSE_CYRIX_6X86
 endif
 
+ifeq ($(GUSMAX), y)
+OPTS		+= -DUSE_GUSMAX
+endif
+
 ifeq ($(HEDAKA), y)
 OPTS		+= -DUSE_HEDAKA
 endif
@@ -527,6 +513,10 @@ OPTS		+= -DUSE_MGA
 DEVBROBJ	+= vid_mga.o
 endif
 
+ifeq ($(NO_SIO), y)
+OPTS		+= -DNO_SIO
+endif
+
 ifeq ($(OPEN_AT), y)
 OPTS		+= -DUSE_OPEN_AT
 endif
@@ -568,10 +558,6 @@ OPTS		+= -DUSE_M6117
 DEVBROBJ	+= ali6117.o
 endif
 
-ifeq ($(596B), y)
-OPTS		+= -DUSE_596B
-endif
-
 ifeq ($(VGAWONDER), y)
 OPTS		+= -DUSE_VGAWONDER
 endif
@@ -580,14 +566,6 @@ ifeq ($(XL24), y)
 OPTS		+= -DUSE_XL24
 endif
 
-ifeq ($(NO_SIO), y)
-OPTS		+= -DNO_SIO
-endif
-
-ifeq ($(GUSMAX), y)
-OPTS		+= -DUSE_GUSMAX
-endif
-
 ifeq ($(USE_VECT486VL), y)
 OPTS		+= -DUSE_VECT486VL
 endif
@@ -637,7 +615,7 @@ MCHOBJ		:= machine.o machine_table.o \
 		    m_xt_xi8088.o m_xt_zenith.o \
 		    m_pcjr.o \
 		    m_amstrad.o m_europc.o \
-		    m_olivetti_m24.o m_tandy.o \
+		    m_xt_olivetti.o m_tandy.o \
 		    m_at.o m_at_commodore.o \
 		    m_at_t3100e.o m_at_t3100e_vid.o \
 		    m_ps1.o m_ps1_hdc.o \
@@ -781,7 +759,8 @@ VIDOBJ		:= video.o \
 		    vid_voodoo_display.o vid_voodoo_fb.o \
 		    vid_voodoo_fifo.o vid_voodoo_reg.o \
 		    vid_voodoo_render.o vid_voodoo_setup.o \
-		    vid_voodoo_texture.o
+		    vid_voodoo_texture.o \
+			vid_ogc.o 
 
 PLATOBJ		:= win.o \
 		    win_dynld.o win_thread.o \

src/win/win_joystick.cpp

@@ -263,7 +263,7 @@ void joystick_process(void)
 {
         int c, d;
 
-	if (joystick_type == JOYSTICK_TYPE_NONE) return;
+	if (!joystick_type) return;
 
         for (c = 0; c < joysticks_present; c++)
         {                

src/win/win_joystick_xinput.c

@@ -217,7 +217,7 @@ void joystick_process(void)
 {
         int c, d;
 
-	if (joystick_type == JOYSTICK_TYPE_NONE) return;
+	if (!joystick_type) return;
 
         joystick_poll();
 

src/win/win_jsconf.c

@@ -324,7 +324,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
         
         *data++ = 0; /*no menu*/
         *data++ = 0; /*predefined dialog box class*/
-        data += MultiByteToWideChar(CP_ACP, 0, "Device Configuration", -1, data, 50);
+        data += MultiByteToWideChar(CP_ACP, 0, "Joystick Configuration", -1, data, 50);
 
         *data++ = 9; /*Point*/
         data += MultiByteToWideChar(CP_ACP, 0, "Segoe UI", -1, data, 50);
@@ -342,7 +342,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
         item->cx = 140;
         item->cy = 150;
 
-        item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWN | WS_VSCROLL;
+        item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
 
         data = (uint16_t *)(item + 1);
         *data++ = 0xFFFF;
@@ -357,7 +357,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
         /*Static text*/
         item = (DLGITEMTEMPLATE *)data;
         item->x = 10;
-        item->y = y;
+        item->y = y + 2;
         item->id = id++;
                 
         item->cx = 60;
@@ -369,7 +369,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
         *data++ = 0xFFFF;
         *data++ = 0x0082;    /* static class */
 
-        data += MultiByteToWideChar(CP_ACP, 0, "Device :", -1, data, 256);
+        data += MultiByteToWideChar(CP_ACP, 0, "Device", -1, data, 256);
         *data++ = 0;              /* no creation data */
                         
         if (((uintptr_t)data) & 2)
@@ -389,7 +389,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
                 item->cx = 140;
                 item->cy = 150;
 
-                item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWN | WS_VSCROLL;
+                item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
 
                 data = (uint16_t *)(item + 1);
                 *data++ = 0xFFFF;
@@ -404,7 +404,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
                 /*Static text*/
                 item = (DLGITEMTEMPLATE *)data;
                 item->x = 10;
-                item->y = y;
+                item->y = y + 2;
                 item->id = id++;
                 
                 item->cx = 60;
@@ -436,7 +436,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
                 item->cx = 140;
                 item->cy = 150;
 
-                item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWN | WS_VSCROLL;
+                item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
 
                 data = (uint16_t *)(item + 1);
                 *data++ = 0xFFFF;
@@ -451,7 +451,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
                 /*Static text*/
                 item = (DLGITEMTEMPLATE *)data;
                 item->x = 10;
-                item->y = y;
+                item->y = y + 2;
                 item->id = id++;
                 
                 item->cx = 60;
@@ -483,7 +483,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
                 item->cx = 140;
                 item->cy = 150;
 
-                item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWN | WS_VSCROLL;
+                item->style = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
 
                 data = (uint16_t *)(item + 1);
                 *data++ = 0xFFFF;
@@ -502,7 +502,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
                 /*Static text*/
                 item = (DLGITEMTEMPLATE *)data;
                 item->x = 10;
-                item->y = y;
+                item->y = y + 2;
                 item->id = id++;
                 
                 item->cx = 60;
@@ -526,8 +526,8 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
         dlg->cdit = (id - IDC_CONFIG_BASE) + 2;
 
         item = (DLGITEMTEMPLATE *)data;
-        item->x = 20;
+        item->x = 100;
-        item->y = y;
+        item->y = y + 5;
         item->cx = 50;
         item->cy = 14;
         item->id = IDOK;  /* OK button identifier */
@@ -544,8 +544,8 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
                 data++;
                 
         item = (DLGITEMTEMPLATE *)data;
-        item->x = 80;
+        item->x = 160;
-        item->y = y;
+        item->y = y + 5;
         item->cx = 50;
         item->cy = 14;
         item->id = IDCANCEL;  /* Cancel button identifier */
@@ -558,7 +558,7 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
         data += MultiByteToWideChar(CP_ACP, 0, "Cancel", -1, data, 50);
         *data++ = 0;              /* no creation data */
 
-        dlg->cy = y + 20;
+        dlg->cy = y + 25;
 
         DialogBoxIndirect(hinstance, dlg, hwnd, joystickconfig_dlgproc);
 

src/win/win_settings.c

@@ -737,7 +737,7 @@ static void
 win_settings_machine_recalc_machine(HWND hdlg)
 {
     HWND h;
-    int c, i, current_eligible, is_at;
+    int c, i, current_eligible;
     LPTSTR lptsTemp;
     char *stransi;
     UDACCEL accel;
@@ -777,22 +777,38 @@ win_settings_machine_recalc_machine(HWND hdlg)
 
     win_settings_machine_recalc_cpu_m(hdlg);
 
+    if ((machines[temp_machine].ram_granularity & 1023)) {
+	/* KB granularity */
 	h = GetDlgItem(hdlg, IDC_MEMSPIN);
 	SendMessage(h, UDM_SETRANGE, 0, (machines[temp_machine].min_ram << 16) | machines[temp_machine].max_ram);
+
 	accel.nSec = 0;
 	accel.nInc = machines[temp_machine].ram_granularity;
 	SendMessage(h, UDM_SETACCEL, 1, (LPARAM)&accel);
-    is_at = IS_AT(temp_machine);
+
-    if (!is_at || (machines[temp_machine].ram_granularity >= 128)) {
 	SendMessage(h, UDM_SETPOS, 0, temp_mem_size);
+
 	h = GetDlgItem(hdlg, IDC_TEXT_MB);
 	SendMessage(h, WM_SETTEXT, 0, win_get_string(IDS_2088));
     } else {
-	SendMessage(h, UDM_SETPOS, 0, temp_mem_size / 1024);
+	/* MB granularity */
+	h = GetDlgItem(hdlg, IDC_MEMSPIN);
+	SendMessage(h, UDM_SETRANGE, 0, (machines[temp_machine].min_ram << 6) | machines[temp_machine].max_ram >> 10);
+
+	accel.nSec = 0;
+	accel.nInc = machines[temp_machine].ram_granularity >> 10;
+
+	SendMessage(h, UDM_SETACCEL, 1, (LPARAM)&accel);
+
+	SendMessage(h, UDM_SETPOS, 0, temp_mem_size >> 10);
+
 	h = GetDlgItem(hdlg, IDC_TEXT_MB);
 	SendMessage(h, WM_SETTEXT, 0, win_get_string(IDS_2086));
     }
 
+    settings_enable_window(hdlg, IDC_MEMSPIN, machines[temp_machine].min_ram != machines[temp_machine].max_ram);
+    settings_enable_window(hdlg, IDC_MEMTEXT, machines[temp_machine].min_ram != machines[temp_machine].max_ram);
+
     free(lptsTemp);
 }
 
@@ -826,7 +842,7 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     HWND h, h2;
     int c, d;
-    int old_machine_type, is_at;
+    int old_machine_type;
     LPTSTR lptsTemp;
     char *stransi;
 
@@ -984,14 +1000,13 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 		SendMessage(h, WM_GETTEXT, 255, (LPARAM) lptsTemp);
 		wcstombs(stransi, lptsTemp, 512);
 		sscanf(stransi, "%u", &temp_mem_size);
+		if (!(machines[temp_machine].ram_granularity & 1023))
+			temp_mem_size = temp_mem_size << 10;
 		temp_mem_size &= ~(machines[temp_machine].ram_granularity - 1);
 		if (temp_mem_size < machines[temp_machine].min_ram)
 			temp_mem_size = machines[temp_machine].min_ram;
 		else if (temp_mem_size > machines[temp_machine].max_ram)
 			temp_mem_size = machines[temp_machine].max_ram;
-		is_at = IS_AT(temp_machine);
-		if (is_at && (machines[temp_machine].ram_granularity < 128))
-			temp_mem_size *= 1024;
 		free(stransi);
 		free(lptsTemp);
 
@@ -4995,7 +5010,7 @@ win_settings_confirm(HWND hdlg)
     SendMessage(hwndChildDialog, WM_SAVESETTINGS, 0, 0);
 
     if (win_settings_changed()) {
-	if (confirm_save)
+	if (confirm_save && !settings_only)
 		i = settings_msgbox_ex(MBX_QUESTION_OK | MBX_WARNING | MBX_DONTASK, (wchar_t *) IDS_2121, (wchar_t *) IDS_2122, (wchar_t *) IDS_2123, NULL, NULL);
 	else
 		i = 0;