summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/msx.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/msx.cpp')
-rw-r--r--src/mame/drivers/msx.cpp500
1 files changed, 250 insertions, 250 deletions
diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp
index ab5ea0e9a42..ce80ed060d1 100644
--- a/src/mame/drivers/msx.cpp
+++ b/src/mame/drivers/msx.cpp
@@ -1341,7 +1341,7 @@ static MACHINE_CONFIG_FRAGMENT( msx2_64kb_vram )
v9938_device::static_set_vram_size(*device, 0x10000);
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( msx, msx_state )
+static MACHINE_CONFIG_START( msx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) /* 3.579545 MHz */
MCFG_CPU_PROGRAM_MAP(msx_memory_map)
@@ -1481,7 +1481,7 @@ static MACHINE_CONFIG_DERIVED( msx_tms9929, msx )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( msx2, msx_state )
+static MACHINE_CONFIG_START( msx2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* 3.579545 MHz */
MCFG_CPU_PROGRAM_MAP(msx_memory_map)
@@ -1539,7 +1539,7 @@ static MACHINE_CONFIG_START( msx2, msx_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( msx2p, msx_state )
+static MACHINE_CONFIG_START( msx2p )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* 3.579545 MHz */
MCFG_CPU_PROGRAM_MAP(msx_memory_map)
@@ -8243,258 +8243,258 @@ static MACHINE_CONFIG_DERIVED( fsa1st, msx2 )
MACHINE_CONFIG_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
/* MSX1 */
-COMP(1986, ax150, 0, 0, ax150, msx, driver_device, 0, "Al Alamiah", "AX-150 (Arabic) (MSX1)", 0)
-COMP(1986, ax170, 0, 0, ax170, msx, driver_device, 0, "Al Alamiah", "AX-170 (Arabic) (MSX1)", 0)
-COMP(1983, canonv8, 0, 0, canonv8, msx, driver_device, 0, "Canon", "V-8 (MSX1)", 0)
-COMP(1983, canonv10, canonv20, 0, canonv10, msx, driver_device, 0, "Canon", "V-10 (MSX1)", 0)
-COMP(1983, canonv20, 0, 0, canonv20, msx, driver_device, 0, "Canon", "V-20 (MSX1)", 0)
-COMP(1983, canonv20e, canonv20, 0, canonv20, msx, driver_device, 0, "Canon", "V-20E (MSX1)", 0) // Different Euro keyboard layout?
-COMP(1983, canonv20f, canonv20, 0, canonv20, msx, driver_device, 0, "Canon", "V-20F (MSX1)", 0) // Different French keyboard layout?
-COMP(1983, canonv20g, canonv20, 0, canonv20, msx, driver_device, 0, "Canon", "V-20G (MSX1)", 0) // Different German keyboard layout?
-COMP(1983, canonv20s, canonv20, 0, canonv20, msx, driver_device, 0, "Canon", "V-20S (MSX1)", 0) // Different Spanish keyboard layout?
-COMP(1984, mx10, 0, 0, mx10, msx, driver_device, 0, "Casio", "MX-10 (MSX1)", 0)
-COMP(1984, mx101, mx10, 0, mx101, msx, driver_device, 0, "Casio", "MX-101 (MSX1)", 0)
-COMP(1984, mx15, mx10, 0, mx15, msx, driver_device, 0, "Casio", "MX-15 (MSX1)", 0)
-COMP(1984, pv7, 0, 0, pv7, msx, driver_device, 0, "Casio", "PV-7 (MSX1)", 0)
-COMP(1984, pv16, 0, 0, pv16, msx, driver_device, 0, "Casio", "PV-16 (MSX1)", 0)
-COMP(198?, cpc88, 0, 0, cpc88, msxkr, driver_device, 0, "Daewoo", "CPC-88 (Korea) (MSX1)", 0)
-COMP(1984, dpc100, dpc200, 0, dpc100, msxkr, driver_device, 0, "Daewoo", "IQ-1000 DPC-100 (Korea) (MSX1)", 0)
-COMP(1984, dpc180, dpc200, 0, dpc180, msxkr, driver_device, 0, "Daewoo", "IQ-1000 DPC-180 (Korea) (MSX1)", 0)
-COMP(1984, dpc200, 0, 0, dpc200, msxkr, driver_device, 0, "Daewoo", "IQ-1000 DPC-200 (Korea) (MSX1)", 0)
-COMP(1985, dpc200e, 0, 0, dpc200e, msx, driver_device, 0, "Daewoo", "DPC-200E (MSX1)", 0)
-COMP(1983, cpc50a, cpc51, 0, cpc50a, msxkr, driver_device, 0, "Daewoo", "Zemmix CPC-50A (Korea) (MSX1)", 0)
-COMP(1983, cpc50b, cpc51, 0, cpc50b, msxkr, driver_device, 0, "Daewoo", "Zemmix CPC-50B (Korea) (MSX1)", 0)
-COMP(1986, cpc51, 0, 0, cpc51, msxkr, driver_device, 0, "Daewoo", "Zemmix CPC-51 (Korea) (MSX1)", 0)
-COMP(1983, fdpc200, 0, 0, fdpc200, msx, driver_device, 0, "Fenner", "DPC-200 (Italy) (MSX1)", 0)
-COMP(1984, fpc500, 0, 0, fpc500, msx, driver_device, 0, "Fenner", "FPC-500 (Italy) (MSX1)", 0)
-COMP(1986, fspc800, 0, 0, fspc800, msx, driver_device, 0, "Fenner", "SPC-800 (Italy) (MSX1)", 0)
-COMP(1984, bruc100, 0, 0, bruc100, msx, driver_device, 0, "Frael", "Bruc 100-1 (MSX1)", 0)
-COMP(1983, fmx, 0, 0, fmx, msxjp, driver_device, 0, "Fujitsu", "FM-X (MSX1)", 0)
-COMP(1984, gsfc80u, 0, 0, gsfc80u, msxkr, driver_device, 0, "Goldstar", "FC-80U (MSX1)", 0)
-COMP(1983, gsfc200, 0, 0, gsfc200, msx, driver_device, 0, "Goldstar", "FC-200 (MSX1)", 0)
-COMP(198?, gfc1080, 0, 0, gfc1080, msxkr, driver_device, 0, "Goldstar", "GFC-1080 (MSX1)", 0)
-COMP(198?, gfc1080a, 0, 0, gfc1080a, msxkr, driver_device, 0, "Goldstar", "GFC-1080A (MSX1)", 0)
-COMP(1983, expert10, expert13, 0, expert10, expert10, driver_device, 0, "Gradiente", "Expert 1.0 (Brazil) (MSX1)", 0)
-COMP(1984, expert11, expert13, 0, expert11, expert11, driver_device, 0, "Gradiente", "Expert 1.1 (Brazil) (MSX1)", 0)
-COMP(1984, expert13, 0, 0, expert13, expert11, driver_device, 0, "Gradiente", "Expert 1.3 (Brazil) (MSX1)", 0)
-COMP(1985, expertdp, 0, 0, expertdp, expert11, driver_device, 0, "Gradiente", "Expert DDPlus (Brazil) (MSX1)", 0)
-COMP(1984, expertpl, 0, 0, expertpl, expert11, driver_device, 0, "Gradiente", "Expert Plus (Brazil) (MSX1)", 0)
-COMP(1984, mbh2, 0, 0, mbh2, msxjp, driver_device, 0, "Hitachi", "MB-H2 (MSX1)", 0)
-COMP(1984, mbh25, 0, 0, mbh25, msxjp, driver_device, 0, "Hitachi", "MB-H25 (MSX1)", 0)
-COMP(1983, mbh50, 0, 0, mbh50, msxjp, driver_device, 0, "Hitachi", "MB-H50 (MSX1)", 0)
-COMP(1983, jvchc7gb, 0, 0, jvchc7gb, msx, driver_device, 0, "JVC", "HC-7GB (MSX1)", 0)
-COMP(198?, mlf48, 0, 0, mlf48, msx, driver_device, 0, "Mitsubishi", "ML-F48 (MSX1)", 0)
-COMP(1983, mlf80, 0, 0, mlf80, msx, driver_device, 0, "Mitsubishi", "ML-F80 (MSX1)", 0)
-COMP(1984, mlf110, 0, 0, mlf110, msxjp, driver_device, 0, "Mitsubishi", "ML-F110 (MSX1)", 0)
-COMP(1984, mlf120, 0, 0, mlf120, msxjp, driver_device, 0, "Mitsubishi", "ML-F120 (MSX1)", 0)
-COMP(1983, mlfx1, 0, 0, mlfx1, msx, driver_device, 0, "Mitsubishi", "ML-FX1 (MSX1)", 0)
-COMP(1984, cf1200, 0, 0, cf1200, msxjp, driver_device, 0, "National / Matsushita", "CF-1200 (Japan) (MSX1)", 0)
-COMP(1983, cf2000, 0, 0, cf2000, msxjp, driver_device, 0, "National / Matsushita", "CF-2000 (Japan) (MSX1)", 0)
-COMP(1984, cf2700, 0, 0, cf2700, msxjp, driver_device, 0, "National / Matsushita", "CF-2700 (Japan) (MSX1)", 0)
-COMP(1984, cf3000, 0, 0, cf3000, msxjp, driver_device, 0, "National / Matsushita", "CF-3000 (Japan) (MSX1)", 0)
-COMP(1985, cf3300, 0, 0, cf3300, msxjp, driver_device, 0, "National / Matsushita", "CF-3300 (Japan) (MSX1)", 0)
-COMP(1985, fs1300, 0, 0, fs1300, msxjp, driver_device, 0, "National / Matsushita", "FS-1300 (Japan) (MSX1)", 0)
-COMP(1985, fs4000, 0, 0, fs4000, msxjp, driver_device, 0, "National / Matsushita", "FS-4000 (Japan) (MSX1)", 0)
-COMP(1985, fs4000a, fs4000, 0, fs4000a, msxjp, driver_device, 0, "National / Matsushita", "FS-4000 (alt) (Japan) (MSX1)", 0)
-COMP(1983, phc2, 0, 0, phc2, msx, driver_device, 0, "Olympia", "PHC-2 (MSX1)" , 0)
-COMP(19??, phc28, 0, 0, phc28, msx, driver_device, 0, "Olympia", "PHC-28 (MSX1)", 0)
-COMP(1984, cf2700g, 0, 0, cf2700g, msx, driver_device, 0, "Panasonic", "CF-2700G (Germany) (MSX1)", 0)
-COMP(198?, perfect1, 0, 0, perfect1, msx, driver_device, 0, "Perfect", "Perfect1 (MSX1)", MACHINE_NOT_WORKING)
-COMP(1983, nms801, 0, 0, nms801, msx, driver_device, 0, "Philips", "NMS-801 (MSX1)", 0)
-COMP(1984, vg8000, vg8010, 0, vg8000, msx, driver_device, 0, "Philips", "VG-8000 (MSX1)", 0)
-COMP(1984, vg8010, 0, 0, vg8010, msx, driver_device, 0, "Philips", "VG-8010 (MSX1)", 0)
-COMP(1984, vg8010f, vg8010, 0, vg8010f, msx, driver_device, 0, "Philips", "VG-8010F (MSX1)" , 0)
-COMP(1985, vg802000, vg802020, 0, vg802000, msx, driver_device, 0, "Philips", "VG-8020-00 (MSX1)", 0)
-COMP(1985, vg802020, 0, 0, vg802020, msx, driver_device, 0, "Philips", "VG-8020-20 (MSX1)", 0)
-COMP(19??, vg8020f, vg802020, 0, vg8020f, msx, driver_device, 0, "Philips", "VG-8020F (MSX1)", 0)
-COMP(1985, piopx7, 0, 0, piopx7, msx, driver_device, 0, "Pioneer", "PX-07 Palcom (MSX1)", 0)
-COMP(1985, piopx7uk, piopx7, 0, piopx7uk, msx, driver_device, 0, "Pioneer", "PX-07UK Palcom (MSX1)", 0)
-COMP(1984, piopxv60, piopx7, 0, piopxv60, msxjp, driver_device, 0, "Pioneer", "PX-V60 (MSX1)", 0)
-COMP(19??, spc800, 0, 0, spc800, msx, driver_device, 0, "Samsung", "SPC-800 (MSX1)", 0)
-COMP(1985, mpc64, 0, 0, mpc64, msxjp, driver_device, 0, "Sanyo", "MPC-64 (MSX1)", 0)
-COMP(1985, mpc100, 0, 0, mpc100, msx, driver_device, 0, "Sanyo", "MPC-100 (MSX1)", 0)
-COMP(1983, mpc200, 0, 0, mpc200, msx, driver_device, 0, "Sanyo", "MPC-200 (MSX1)", 0)
-COMP(1983, mpc200sp, mpc200, 0, mpc200sp, msx, driver_device, 0, "Sanyo", "MPC-200SP (MSX1)", 0) // Spanish keyboard?
-COMP(1983, phc28l, 0, 0, phc28l, msx, driver_device, 0, "Sanyo", "PHC-28L (MSX1)", 0)
-COMP(1983, phc28s, 0, 0, phc28s, msx, driver_device, 0, "Sanyo", "PHC-28S (MSX1)", 0)
-COMP(19??, mpc10, 0, 0, mpc10, msx, driver_device, 0, "Sanyo", "Wavy MPC-10 (MSX1)", 0)
-COMP(1985, hotbit11, hotbi13p, 0, hotbit11, hotbit, driver_device, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.1 (MSX1)", 0)
-COMP(1985, hotbit12, hotbi13p, 0, hotbit12, hotbit, driver_device, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.2 (MSX1)", 0)
-COMP(1985, hotbi13b, hotbi13p, 0, hotbi13b, hotbit, driver_device, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.3b (MSX1)", 0)
-COMP(1985, hotbi13p, 0, 0, hotbi13p, hotbit, driver_device, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.3p (MSX1)", 0)
-COMP(198?, hb10, hb10p, 0, hb10, msxjp, driver_device, 0, "Sony", "HB-10 (MSX1)", 0)
-COMP(1985, hb10p, 0, 0, hb10p, msx, driver_device, 0, "Sony", "HB-10P (MSX1)", 0)
-COMP(1984, hb101p, 0, 0, hb101p, msx, driver_device, 0, "Sony", "HB-101P (MSX1)", 0)
-COMP(1985, hb20p, 0, 0, hb20p, msx, driver_device, 0, "Sony", "HB-20P (Spanish) (MSX1)", 0)
-COMP(1985, hb201, hb201p, 0, hb201, msxjp, driver_device, 0, "Sony", "HB-201 (Japan) (MSX1)", 0)
-COMP(1985, hb201p, 0, 0, hb201p, msx, driver_device, 0, "Sony", "HB-201P (MSX1)", 0)
-COMP(1984, hb501p, 0, 0, hb501p, msx, driver_device, 0, "Sony", "HB-501P (MSX1)", 0)
-COMP(1983, hb55, hb55p, 0, hb55, msxjp, driver_device, 0, "Sony", "HB-55 (MSX1)", 0)
-COMP(1983, hb55d, hb55p, 0, hb55d, msx, driver_device, 0, "Sony", "HB-55D (Germany) (MSX1)", 0)
-COMP(1983, hb55p, 0, 0, hb55p, msx, driver_device, 0, "Sony", "HB-55P (MSX1)", 0)
-COMP(1984, hb701fd, 0, 0, hb701fd, msxjp, driver_device, 0, "Sony", "HB-701FD (MSX1)", 0)
-COMP(1983, hb75d, hb75p, 0, hb75d, msx, driver_device, 0, "Sony", "HB-75D (Germany) (MSX1)", 0)
-COMP(1983, hb75p, 0, 0, hb75p, msx, driver_device, 0, "Sony", "HB-75P (MSX1)", 0)
-COMP(1985, svi728, 0, 0, svi728, msx, driver_device, 0, "Spectravideo", "SVI-728 (MSX1)", 0)
-COMP(1985, svi738, 0, 0, svi738, msx, driver_device, 0, "Spectravideo", "SVI-738 (MSX1)", 0)
-COMP(1983, svi738ar, svi738, 0, svi738ar, msx, driver_device, 0, "Spectravideo", "SVI-738 (Arabic) (MSX1)", 0)
-COMP(1983, svi738dk, svi738, 0, svi738dk, msx, driver_device, 0, "Spectravideo", "SVI-738 (Denmark) (MSX1)", 0)
-COMP(1983, svi738sp, svi738, 0, svi738sp, msx, driver_device, 0, "Spectravideo", "SVI-738 (Spain) (MSX1)", 0)
-COMP(1983, svi738sw, svi738, 0, svi738sw, msx, driver_device, 0, "Spectravideo", "SVI-738 (Swedish) (MSX1)", 0)
-COMP(1983, svi738pl, svi738, 0, svi738pl, msx, driver_device, 0, "Spectravideo", "SVI-738 (Poland) (MSX1)", 0)
-COMP(1983, tadpc200, dpc200, 0, tadpc200, msx, driver_device, 0, "Talent", "DPC-200 (MSX1)", 0)
-COMP(1983, tadpc20a, dpc200, 0, tadpc20a, msx, driver_device, 0, "Talent", "DPC-200A (MSX1)", 0)
-COMP(1984, hx10, 0, 0, hx10, msx, driver_device, 0, "Toshiba", "HX-10 (MSX1)", 0)
-COMP(1984, hx10d, hx10, 0, hx10d, msxjp, driver_device, 0, "Toshiba", "HX-10D (MSX1)", 0)
-COMP(1984, hx10dp, hx10, 0, hx10dp, msxjp, driver_device, 0, "Toshiba", "HX-10DP (MSX1)", 0)
-COMP(1984, hx10e, hx10, 0, hx10e, msx, driver_device, 0, "Toshiba", "HX-10E (MSX1)", 0)
-COMP(1984, hx10f, hx10, 0, hx10f, msx, driver_device, 0, "Toshiba", "HX-10F (MSX1)", 0)
-COMP(1984, hx10s, hx10, 0, hx10s, msx, driver_device, 0, "Toshiba", "HX-10S (MSX1)", 0)
-COMP(1984, hx10sa, hx10, 0, hx10sa, msxjp, driver_device, 0, "Toshiba", "HX-10SA (MSX1)", 0)
-COMP(1984, hx20, 0, 0, hx20, msx, driver_device, 0, "Toshiba", "HX-20 (MSX1)", 0)
-COMP(1984, hx20i, hx20, 0, hx20i, msx, driver_device, 0, "Toshiba", "HX-20I (MSX1)", 0)
-COMP(1984, hx21, 0, 0, hx21, msxjp, driver_device, 0, "Toshiba", "HX-21 (MSX1)", MACHINE_NOT_WORKING) // Does not go into firmware
-COMP(1984, hx21i, hx21, 0, hx21i, msx, driver_device, 0, "Toshiba", "HX-21I (MSX1)", 0)
-COMP(1984, hx22, 0, 0, hx22, msxjp, driver_device, 0, "Toshiba", "HX-22 (MSX1)", MACHINE_NOT_WORKING) // Does not go into firmware
-COMP(1984, hx22i, hx22, 0, hx22i, msx, driver_device, 0, "Toshiba", "HX-22I (MSX1)", 0)
-COMP(198?, hc5, hc7, 0, hc5, msxjp, driver_device, 0, "Victor", "HC-5 (MSX1)", 0)
-COMP(198?, hc6, hc7, 0, hc6, msxjp, driver_device, 0, "Victor", "HC-6 (MSX1)", 0)
-COMP(198?, hc7, 0, 0, hc7, msxjp, driver_device, 0, "Victor", "HC-7 (MSX1)", 0)
-COMP(1984, cx5f1, cx5f, 0, cx5f1, msxjp, driver_device, 0, "Yamaha", "CX5F (w/SFG01) (MSX1)", 0)
-COMP(1984, cx5f, 0, 0, cx5f, msxjp, driver_device, 0, "Yamaha", "CX5F (w/SFG05) (MSX1)", 0)
-COMP(1984, cx5m, cx5m128, 0, cx5m, msx, driver_device, 0, "Yamaha", "CX5M (MSX1)", 0)
-COMP(1984, cx5m128, 0, 0, cx5m128, msx, driver_device, 0, "Yamaha", "CX5M-128 (MSX1)", 0)
-COMP(1984, cx5m2, cx5m128, 0, cx5m2, msx, driver_device, 0, "Yamaha", "CX5MII (MSX1)", 0)
-COMP(1984, yis303, 0, 0, yis303, msx, driver_device, 0, "Yamaha", "YIS303 (MSX1)", 0)
-COMP(1984, yis503, 0, 0, yis503, msx, driver_device, 0, "Yamaha", "YIS503 (MSX1)", 0)
-COMP(19??, yis503f, yis503, 0, yis503f, msx, driver_device, 0, "Yamaha", "YIS503F (MSX1)", 0)
-COMP(1984, yis503ii, yis503, 0, yis503ii, msx, driver_device, 0, "Yamaha", "YIS503II (MSX1)", 0)
-COMP(1986, y503iir, yis503, 0, y503iir, msx, driver_device, 0, "Yamaha", "YIS503IIR (Russian) (MSX1)", 0)
-COMP(1986, y503iir2, yis503, 0, y503iir2, msx, driver_device, 0, "Yamaha", "YIS503IIR (Estonian) (MSX1)", 0)
-COMP(1984, yis503m, yis503, 0, yis503m, msx, driver_device, 0, "Yamaha", "YIS503M (MSX1)", 0)
-COMP(1984, yc64, 0, 0, yc64, msx, driver_device, 0, "Yashica", "YC-64 (MSX1)", 0)
-COMP(1984, mx64, 0, 0, mx64, msxkr, driver_device, 0, "Yeno", "MX64 (MSX1)", 0)
+COMP(1986, ax150, 0, 0, ax150, msx, msx_state, 0, "Al Alamiah", "AX-150 (Arabic) (MSX1)", 0)
+COMP(1986, ax170, 0, 0, ax170, msx, msx_state, 0, "Al Alamiah", "AX-170 (Arabic) (MSX1)", 0)
+COMP(1983, canonv8, 0, 0, canonv8, msx, msx_state, 0, "Canon", "V-8 (MSX1)", 0)
+COMP(1983, canonv10, canonv20, 0, canonv10, msx, msx_state, 0, "Canon", "V-10 (MSX1)", 0)
+COMP(1983, canonv20, 0, 0, canonv20, msx, msx_state, 0, "Canon", "V-20 (MSX1)", 0)
+COMP(1983, canonv20e, canonv20, 0, canonv20, msx, msx_state, 0, "Canon", "V-20E (MSX1)", 0) // Different Euro keyboard layout?
+COMP(1983, canonv20f, canonv20, 0, canonv20, msx, msx_state, 0, "Canon", "V-20F (MSX1)", 0) // Different French keyboard layout?
+COMP(1983, canonv20g, canonv20, 0, canonv20, msx, msx_state, 0, "Canon", "V-20G (MSX1)", 0) // Different German keyboard layout?
+COMP(1983, canonv20s, canonv20, 0, canonv20, msx, msx_state, 0, "Canon", "V-20S (MSX1)", 0) // Different Spanish keyboard layout?
+COMP(1984, mx10, 0, 0, mx10, msx, msx_state, 0, "Casio", "MX-10 (MSX1)", 0)
+COMP(1984, mx101, mx10, 0, mx101, msx, msx_state, 0, "Casio", "MX-101 (MSX1)", 0)
+COMP(1984, mx15, mx10, 0, mx15, msx, msx_state, 0, "Casio", "MX-15 (MSX1)", 0)
+COMP(1984, pv7, 0, 0, pv7, msx, msx_state, 0, "Casio", "PV-7 (MSX1)", 0)
+COMP(1984, pv16, 0, 0, pv16, msx, msx_state, 0, "Casio", "PV-16 (MSX1)", 0)
+COMP(198?, cpc88, 0, 0, cpc88, msxkr, msx_state, 0, "Daewoo", "CPC-88 (Korea) (MSX1)", 0)
+COMP(1984, dpc100, dpc200, 0, dpc100, msxkr, msx_state, 0, "Daewoo", "IQ-1000 DPC-100 (Korea) (MSX1)", 0)
+COMP(1984, dpc180, dpc200, 0, dpc180, msxkr, msx_state, 0, "Daewoo", "IQ-1000 DPC-180 (Korea) (MSX1)", 0)
+COMP(1984, dpc200, 0, 0, dpc200, msxkr, msx_state, 0, "Daewoo", "IQ-1000 DPC-200 (Korea) (MSX1)", 0)
+COMP(1985, dpc200e, 0, 0, dpc200e, msx, msx_state, 0, "Daewoo", "DPC-200E (MSX1)", 0)
+COMP(1983, cpc50a, cpc51, 0, cpc50a, msxkr, msx_state, 0, "Daewoo", "Zemmix CPC-50A (Korea) (MSX1)", 0)
+COMP(1983, cpc50b, cpc51, 0, cpc50b, msxkr, msx_state, 0, "Daewoo", "Zemmix CPC-50B (Korea) (MSX1)", 0)
+COMP(1986, cpc51, 0, 0, cpc51, msxkr, msx_state, 0, "Daewoo", "Zemmix CPC-51 (Korea) (MSX1)", 0)
+COMP(1983, fdpc200, 0, 0, fdpc200, msx, msx_state, 0, "Fenner", "DPC-200 (Italy) (MSX1)", 0)
+COMP(1984, fpc500, 0, 0, fpc500, msx, msx_state, 0, "Fenner", "FPC-500 (Italy) (MSX1)", 0)
+COMP(1986, fspc800, 0, 0, fspc800, msx, msx_state, 0, "Fenner", "SPC-800 (Italy) (MSX1)", 0)
+COMP(1984, bruc100, 0, 0, bruc100, msx, msx_state, 0, "Frael", "Bruc 100-1 (MSX1)", 0)
+COMP(1983, fmx, 0, 0, fmx, msxjp, msx_state, 0, "Fujitsu", "FM-X (MSX1)", 0)
+COMP(1984, gsfc80u, 0, 0, gsfc80u, msxkr, msx_state, 0, "Goldstar", "FC-80U (MSX1)", 0)
+COMP(1983, gsfc200, 0, 0, gsfc200, msx, msx_state, 0, "Goldstar", "FC-200 (MSX1)", 0)
+COMP(198?, gfc1080, 0, 0, gfc1080, msxkr, msx_state, 0, "Goldstar", "GFC-1080 (MSX1)", 0)
+COMP(198?, gfc1080a, 0, 0, gfc1080a, msxkr, msx_state, 0, "Goldstar", "GFC-1080A (MSX1)", 0)
+COMP(1983, expert10, expert13, 0, expert10, expert10, msx_state, 0, "Gradiente", "Expert 1.0 (Brazil) (MSX1)", 0)
+COMP(1984, expert11, expert13, 0, expert11, expert11, msx_state, 0, "Gradiente", "Expert 1.1 (Brazil) (MSX1)", 0)
+COMP(1984, expert13, 0, 0, expert13, expert11, msx_state, 0, "Gradiente", "Expert 1.3 (Brazil) (MSX1)", 0)
+COMP(1985, expertdp, 0, 0, expertdp, expert11, msx_state, 0, "Gradiente", "Expert DDPlus (Brazil) (MSX1)", 0)
+COMP(1984, expertpl, 0, 0, expertpl, expert11, msx_state, 0, "Gradiente", "Expert Plus (Brazil) (MSX1)", 0)
+COMP(1984, mbh2, 0, 0, mbh2, msxjp, msx_state, 0, "Hitachi", "MB-H2 (MSX1)", 0)
+COMP(1984, mbh25, 0, 0, mbh25, msxjp, msx_state, 0, "Hitachi", "MB-H25 (MSX1)", 0)
+COMP(1983, mbh50, 0, 0, mbh50, msxjp, msx_state, 0, "Hitachi", "MB-H50 (MSX1)", 0)
+COMP(1983, jvchc7gb, 0, 0, jvchc7gb, msx, msx_state, 0, "JVC", "HC-7GB (MSX1)", 0)
+COMP(198?, mlf48, 0, 0, mlf48, msx, msx_state, 0, "Mitsubishi", "ML-F48 (MSX1)", 0)
+COMP(1983, mlf80, 0, 0, mlf80, msx, msx_state, 0, "Mitsubishi", "ML-F80 (MSX1)", 0)
+COMP(1984, mlf110, 0, 0, mlf110, msxjp, msx_state, 0, "Mitsubishi", "ML-F110 (MSX1)", 0)
+COMP(1984, mlf120, 0, 0, mlf120, msxjp, msx_state, 0, "Mitsubishi", "ML-F120 (MSX1)", 0)
+COMP(1983, mlfx1, 0, 0, mlfx1, msx, msx_state, 0, "Mitsubishi", "ML-FX1 (MSX1)", 0)
+COMP(1984, cf1200, 0, 0, cf1200, msxjp, msx_state, 0, "National / Matsushita", "CF-1200 (Japan) (MSX1)", 0)
+COMP(1983, cf2000, 0, 0, cf2000, msxjp, msx_state, 0, "National / Matsushita", "CF-2000 (Japan) (MSX1)", 0)
+COMP(1984, cf2700, 0, 0, cf2700, msxjp, msx_state, 0, "National / Matsushita", "CF-2700 (Japan) (MSX1)", 0)
+COMP(1984, cf3000, 0, 0, cf3000, msxjp, msx_state, 0, "National / Matsushita", "CF-3000 (Japan) (MSX1)", 0)
+COMP(1985, cf3300, 0, 0, cf3300, msxjp, msx_state, 0, "National / Matsushita", "CF-3300 (Japan) (MSX1)", 0)
+COMP(1985, fs1300, 0, 0, fs1300, msxjp, msx_state, 0, "National / Matsushita", "FS-1300 (Japan) (MSX1)", 0)
+COMP(1985, fs4000, 0, 0, fs4000, msxjp, msx_state, 0, "National / Matsushita", "FS-4000 (Japan) (MSX1)", 0)
+COMP(1985, fs4000a, fs4000, 0, fs4000a, msxjp, msx_state, 0, "National / Matsushita", "FS-4000 (alt) (Japan) (MSX1)", 0)
+COMP(1983, phc2, 0, 0, phc2, msx, msx_state, 0, "Olympia", "PHC-2 (MSX1)" , 0)
+COMP(19??, phc28, 0, 0, phc28, msx, msx_state, 0, "Olympia", "PHC-28 (MSX1)", 0)
+COMP(1984, cf2700g, 0, 0, cf2700g, msx, msx_state, 0, "Panasonic", "CF-2700G (Germany) (MSX1)", 0)
+COMP(198?, perfect1, 0, 0, perfect1, msx, msx_state, 0, "Perfect", "Perfect1 (MSX1)", MACHINE_NOT_WORKING)
+COMP(1983, nms801, 0, 0, nms801, msx, msx_state, 0, "Philips", "NMS-801 (MSX1)", 0)
+COMP(1984, vg8000, vg8010, 0, vg8000, msx, msx_state, 0, "Philips", "VG-8000 (MSX1)", 0)
+COMP(1984, vg8010, 0, 0, vg8010, msx, msx_state, 0, "Philips", "VG-8010 (MSX1)", 0)
+COMP(1984, vg8010f, vg8010, 0, vg8010f, msx, msx_state, 0, "Philips", "VG-8010F (MSX1)" , 0)
+COMP(1985, vg802000, vg802020, 0, vg802000, msx, msx_state, 0, "Philips", "VG-8020-00 (MSX1)", 0)
+COMP(1985, vg802020, 0, 0, vg802020, msx, msx_state, 0, "Philips", "VG-8020-20 (MSX1)", 0)
+COMP(19??, vg8020f, vg802020, 0, vg8020f, msx, msx_state, 0, "Philips", "VG-8020F (MSX1)", 0)
+COMP(1985, piopx7, 0, 0, piopx7, msx, msx_state, 0, "Pioneer", "PX-07 Palcom (MSX1)", 0)
+COMP(1985, piopx7uk, piopx7, 0, piopx7uk, msx, msx_state, 0, "Pioneer", "PX-07UK Palcom (MSX1)", 0)
+COMP(1984, piopxv60, piopx7, 0, piopxv60, msxjp, msx_state, 0, "Pioneer", "PX-V60 (MSX1)", 0)
+COMP(19??, spc800, 0, 0, spc800, msx, msx_state, 0, "Samsung", "SPC-800 (MSX1)", 0)
+COMP(1985, mpc64, 0, 0, mpc64, msxjp, msx_state, 0, "Sanyo", "MPC-64 (MSX1)", 0)
+COMP(1985, mpc100, 0, 0, mpc100, msx, msx_state, 0, "Sanyo", "MPC-100 (MSX1)", 0)
+COMP(1983, mpc200, 0, 0, mpc200, msx, msx_state, 0, "Sanyo", "MPC-200 (MSX1)", 0)
+COMP(1983, mpc200sp, mpc200, 0, mpc200sp, msx, msx_state, 0, "Sanyo", "MPC-200SP (MSX1)", 0) // Spanish keyboard?
+COMP(1983, phc28l, 0, 0, phc28l, msx, msx_state, 0, "Sanyo", "PHC-28L (MSX1)", 0)
+COMP(1983, phc28s, 0, 0, phc28s, msx, msx_state, 0, "Sanyo", "PHC-28S (MSX1)", 0)
+COMP(19??, mpc10, 0, 0, mpc10, msx, msx_state, 0, "Sanyo", "Wavy MPC-10 (MSX1)", 0)
+COMP(1985, hotbit11, hotbi13p, 0, hotbit11, hotbit, msx_state, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.1 (MSX1)", 0)
+COMP(1985, hotbit12, hotbi13p, 0, hotbit12, hotbit, msx_state, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.2 (MSX1)", 0)
+COMP(1985, hotbi13b, hotbi13p, 0, hotbi13b, hotbit, msx_state, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.3b (MSX1)", 0)
+COMP(1985, hotbi13p, 0, 0, hotbi13p, hotbit, msx_state, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.3p (MSX1)", 0)
+COMP(198?, hb10, hb10p, 0, hb10, msxjp, msx_state, 0, "Sony", "HB-10 (MSX1)", 0)
+COMP(1985, hb10p, 0, 0, hb10p, msx, msx_state, 0, "Sony", "HB-10P (MSX1)", 0)
+COMP(1984, hb101p, 0, 0, hb101p, msx, msx_state, 0, "Sony", "HB-101P (MSX1)", 0)
+COMP(1985, hb20p, 0, 0, hb20p, msx, msx_state, 0, "Sony", "HB-20P (Spanish) (MSX1)", 0)
+COMP(1985, hb201, hb201p, 0, hb201, msxjp, msx_state, 0, "Sony", "HB-201 (Japan) (MSX1)", 0)
+COMP(1985, hb201p, 0, 0, hb201p, msx, msx_state, 0, "Sony", "HB-201P (MSX1)", 0)
+COMP(1984, hb501p, 0, 0, hb501p, msx, msx_state, 0, "Sony", "HB-501P (MSX1)", 0)
+COMP(1983, hb55, hb55p, 0, hb55, msxjp, msx_state, 0, "Sony", "HB-55 (MSX1)", 0)
+COMP(1983, hb55d, hb55p, 0, hb55d, msx, msx_state, 0, "Sony", "HB-55D (Germany) (MSX1)", 0)
+COMP(1983, hb55p, 0, 0, hb55p, msx, msx_state, 0, "Sony", "HB-55P (MSX1)", 0)
+COMP(1984, hb701fd, 0, 0, hb701fd, msxjp, msx_state, 0, "Sony", "HB-701FD (MSX1)", 0)
+COMP(1983, hb75d, hb75p, 0, hb75d, msx, msx_state, 0, "Sony", "HB-75D (Germany) (MSX1)", 0)
+COMP(1983, hb75p, 0, 0, hb75p, msx, msx_state, 0, "Sony", "HB-75P (MSX1)", 0)
+COMP(1985, svi728, 0, 0, svi728, msx, msx_state, 0, "Spectravideo", "SVI-728 (MSX1)", 0)
+COMP(1985, svi738, 0, 0, svi738, msx, msx_state, 0, "Spectravideo", "SVI-738 (MSX1)", 0)
+COMP(1983, svi738ar, svi738, 0, svi738ar, msx, msx_state, 0, "Spectravideo", "SVI-738 (Arabic) (MSX1)", 0)
+COMP(1983, svi738dk, svi738, 0, svi738dk, msx, msx_state, 0, "Spectravideo", "SVI-738 (Denmark) (MSX1)", 0)
+COMP(1983, svi738sp, svi738, 0, svi738sp, msx, msx_state, 0, "Spectravideo", "SVI-738 (Spain) (MSX1)", 0)
+COMP(1983, svi738sw, svi738, 0, svi738sw, msx, msx_state, 0, "Spectravideo", "SVI-738 (Swedish) (MSX1)", 0)
+COMP(1983, svi738pl, svi738, 0, svi738pl, msx, msx_state, 0, "Spectravideo", "SVI-738 (Poland) (MSX1)", 0)
+COMP(1983, tadpc200, dpc200, 0, tadpc200, msx, msx_state, 0, "Talent", "DPC-200 (MSX1)", 0)
+COMP(1983, tadpc20a, dpc200, 0, tadpc20a, msx, msx_state, 0, "Talent", "DPC-200A (MSX1)", 0)
+COMP(1984, hx10, 0, 0, hx10, msx, msx_state, 0, "Toshiba", "HX-10 (MSX1)", 0)
+COMP(1984, hx10d, hx10, 0, hx10d, msxjp, msx_state, 0, "Toshiba", "HX-10D (MSX1)", 0)
+COMP(1984, hx10dp, hx10, 0, hx10dp, msxjp, msx_state, 0, "Toshiba", "HX-10DP (MSX1)", 0)
+COMP(1984, hx10e, hx10, 0, hx10e, msx, msx_state, 0, "Toshiba", "HX-10E (MSX1)", 0)
+COMP(1984, hx10f, hx10, 0, hx10f, msx, msx_state, 0, "Toshiba", "HX-10F (MSX1)", 0)
+COMP(1984, hx10s, hx10, 0, hx10s, msx, msx_state, 0, "Toshiba", "HX-10S (MSX1)", 0)
+COMP(1984, hx10sa, hx10, 0, hx10sa, msxjp, msx_state, 0, "Toshiba", "HX-10SA (MSX1)", 0)
+COMP(1984, hx20, 0, 0, hx20, msx, msx_state, 0, "Toshiba", "HX-20 (MSX1)", 0)
+COMP(1984, hx20i, hx20, 0, hx20i, msx, msx_state, 0, "Toshiba", "HX-20I (MSX1)", 0)
+COMP(1984, hx21, 0, 0, hx21, msxjp, msx_state, 0, "Toshiba", "HX-21 (MSX1)", MACHINE_NOT_WORKING) // Does not go into firmware
+COMP(1984, hx21i, hx21, 0, hx21i, msx, msx_state, 0, "Toshiba", "HX-21I (MSX1)", 0)
+COMP(1984, hx22, 0, 0, hx22, msxjp, msx_state, 0, "Toshiba", "HX-22 (MSX1)", MACHINE_NOT_WORKING) // Does not go into firmware
+COMP(1984, hx22i, hx22, 0, hx22i, msx, msx_state, 0, "Toshiba", "HX-22I (MSX1)", 0)
+COMP(198?, hc5, hc7, 0, hc5, msxjp, msx_state, 0, "Victor", "HC-5 (MSX1)", 0)
+COMP(198?, hc6, hc7, 0, hc6, msxjp, msx_state, 0, "Victor", "HC-6 (MSX1)", 0)
+COMP(198?, hc7, 0, 0, hc7, msxjp, msx_state, 0, "Victor", "HC-7 (MSX1)", 0)
+COMP(1984, cx5f1, cx5f, 0, cx5f1, msxjp, msx_state, 0, "Yamaha", "CX5F (w/SFG01) (MSX1)", 0)
+COMP(1984, cx5f, 0, 0, cx5f, msxjp, msx_state, 0, "Yamaha", "CX5F (w/SFG05) (MSX1)", 0)
+COMP(1984, cx5m, cx5m128, 0, cx5m, msx, msx_state, 0, "Yamaha", "CX5M (MSX1)", 0)
+COMP(1984, cx5m128, 0, 0, cx5m128, msx, msx_state, 0, "Yamaha", "CX5M-128 (MSX1)", 0)
+COMP(1984, cx5m2, cx5m128, 0, cx5m2, msx, msx_state, 0, "Yamaha", "CX5MII (MSX1)", 0)
+COMP(1984, yis303, 0, 0, yis303, msx, msx_state, 0, "Yamaha", "YIS303 (MSX1)", 0)
+COMP(1984, yis503, 0, 0, yis503, msx, msx_state, 0, "Yamaha", "YIS503 (MSX1)", 0)
+COMP(19??, yis503f, yis503, 0, yis503f, msx, msx_state, 0, "Yamaha", "YIS503F (MSX1)", 0)
+COMP(1984, yis503ii, yis503, 0, yis503ii, msx, msx_state, 0, "Yamaha", "YIS503II (MSX1)", 0)
+COMP(1986, y503iir, yis503, 0, y503iir, msx, msx_state, 0, "Yamaha", "YIS503IIR (Russian) (MSX1)", 0)
+COMP(1986, y503iir2, yis503, 0, y503iir2, msx, msx_state, 0, "Yamaha", "YIS503IIR (Estonian) (MSX1)", 0)
+COMP(1984, yis503m, yis503, 0, yis503m, msx, msx_state, 0, "Yamaha", "YIS503M (MSX1)", 0)
+COMP(1984, yc64, 0, 0, yc64, msx, msx_state, 0, "Yashica", "YC-64 (MSX1)", 0)
+COMP(1984, mx64, 0, 0, mx64, msxkr, msx_state, 0, "Yeno", "MX64 (MSX1)", 0)
/* MSX2 */
-COMP(1986, ax350, 0, 0, ax350, msx2, driver_device, 0, "Al Alamiah", "AX-350 (Arabic) (MSX2)", 0)
-COMP(1986, ax370, 0, 0, ax370, msx2, driver_device, 0, "Al Alamiah", "AX-370 (Arabic) (MSX2)", 0)
-COMP(1985, canonv25, 0, 0, canonv25, msx2, driver_device, 0, "Canon", "V-25 (MSX2)", 0)
-COMP(1985, canonv30, 0, 0, canonv30, msx2, driver_device, 0, "Canon", "V-30 (MSX2)", 0)
-COMP(1985, canonv30f, canonv30, 0, canonv30f, msx2, driver_device, 0, "Canon", "V-30F (MSX2)", 0)
-COMP(1986, cpc300, 0, 0, cpc300, msx2kr, driver_device, 0, "Daewoo", "IQ-2000 CPC-300 (Korea) (MSX2)", 0)
-COMP(1986, cpc300e, 0, 0, cpc300e, msx2kr, driver_device, 0, "Daewoo", "IQ-2000 CPC-300E (Korea) (MSX2)", 0)
-COMP(1985, cpc330k, 0, 0, cpc330k, msx2kr, driver_device, 0, "Daewoo", "CPC-330K KOBO (Korea) (MSX2)", 0)
-COMP(1988, cpc400, 0, 0, cpc400, msx2kr, driver_device, 0, "Daewoo", "X-II CPC-400 (Korea) (MSX2)", 0)
-COMP(1988, cpc400s, 0, 0, cpc400s, msx2kr, driver_device, 0, "Daewoo", "X-II CPC-400S (Korea) (MSX2)", 0)
-COMP(1990, cpc61, 0, 0, cpc61, msx2kr, driver_device, 0, "Daewoo", "Zemmix CPC-61 (Korea) (MSX2)", 0)
-COMP(1991, cpg120, 0, 0, cpg120, msx2kr, driver_device, 0, "Daewoo", "Zemmix CPG-120 Normal (Korea) (MSX2)", MACHINE_NOT_WORKING) // v9958 not added
-COMP(198?, fpc900, 0, 0, fpc900, msx2, driver_device, 0, "Fenner", "FPC-900 (MSX2)", 0)
-COMP(1986, expert20, 0, 0, expert20, msx2, driver_device, 0, "Gradiente", "Expert 2.0 (Brazil) (MSX2)", 0)
-COMP(198?, mbh70, 0, 0, mbh70, msx2jp, driver_device, 0, "Hitachi", "MB-H70 (MSX2)", MACHINE_NOT_WORKING) // Firmware not working
-COMP(1987, kmc5000, 0, 0, kmc5000, msx2jp, driver_device, 0, "Kawai", "KMC-5000 (MSX2)", 0)
-COMP(1985, mlg1, 0, 0, mlg1, msx2, driver_device, 0, "Mitsubishi", "ML-G1 (MSX2)", 0)
-COMP(198?, mlg3, 0, 0, mlg3, msx2, driver_device, 0, "Mitsubishi", "ML-G3 (MSX2)", 0)
-COMP(1985, mlg10, 0, 0, mlg10, msx2jp, driver_device, 0, "Mitsubishi", "ML-G10 (MSX2)", 0)
-COMP(1983, mlg30, 0, 0, mlg30, msx2, driver_device, 0, "Mitsubishi", "ML-G30 (MSX2)", 0)
-COMP(1985, fs5500f1, fs5500f2, 0, fs5500f1, msx2jp, driver_device, 0, "National / Matsushita", "FS-5500F1 (Japan) (MSX2)", 0)
-COMP(1985, fs5500f2, 0, 0, fs5500f2, msx2jp, driver_device, 0, "National / Matsushita", "FS-5500F2 (Japan) (MSX2)", 0)
-COMP(1986, fs4500, 0, 0, fs4500, msx2jp, driver_device, 0, "National / Matsushita", "FS-4500 (Japan) (MSX2)", 0)
-COMP(1986, fs4700, 0, 0, fs4700, msx2jp, driver_device, 0, "National / Matsushita", "FS-4700 (Japan) (MSX2)", 0)
-COMP(1986, fs5000, 0, 0, fs5000, msx2jp, driver_device, 0, "National / Matsushita", "FS-5000F2 (Japan) (MSX2)", 0)
-COMP(1986, fs4600, 0, 0, fs4600, msx2jp, driver_device, 0, "National / Matsushita", "FS-4600 (Japan) (MSX2)", 0)
-COMP(1986, fsa1, fsa1a, 0, fsa1, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1 / 1st released version (Japan) (MSX2)", 0)
-COMP(1986, fsa1a, 0, 0, fsa1a, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1 / 2nd released version (Japan) (MSX2)", 0)
-COMP(1987, fsa1mk2, 0, 0, fsa1mk2, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1MK2 (Japan) (MSX2)", 0)
-COMP(1987, fsa1f, 0, 0, fsa1f, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1F (Japan) (MSX2)", 0)
-COMP(1987, fsa1fm, 0, 0, fsa1fm, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1FM (Japan) (MSX2)", 0)
-COMP(1986, nms8220, nms8220a, 0, nms8220, msx2, driver_device, 0, "Philips", "NMS-8220 (12-jun-1986) (MSX2)", 0)
-COMP(1986, nms8220a, 0, 0, nms8220a, msx2, driver_device, 0, "Philips", "NMS-8220 (13-aug-1986) (MSX2)", 0)
-COMP(1986, vg8230, 0, 0, vg8230, msx2, driver_device, 0, "Philips", "VG-8230 (MSX2)", 0)
-COMP(19??, vg8230j, vg8230, 0, vg8230j, msx2jp, driver_device, 0, "Philips", "VG-8230J (MSX2)", MACHINE_NOT_WORKING) // Screen flashes a few times before going into basic
-COMP(1986, vg8235, 0, 0, vg8235, msx2, driver_device, 0, "Philips", "VG-8235 (MSX2)", 0)
-COMP(1986, vg8235f, vg8235, 0, vg8235f, msx2, driver_device, 0, "Philips", "VG-8235F (MSX2)", 0)
-COMP(1986, vg8240, 0, 0, vg8240, msx2, driver_device, 0, "Philips", "VG-8240 (MSX2)", 0)
-COMP(1986, nms8245, 0, 0, nms8245, msx2, driver_device, 0, "Philips", "NMS-8245 (MSX2)", 0)
-COMP(1986, nms8245f, nms8245, 0, nms8245f, msx2, driver_device, 0, "Philips", "NMS-8245F (MSX2)", 0)
-COMP(1986, nms8250, nms8255, 0, nms8250, msx2, driver_device, 0, "Philips", "NMS-8250 (MSX2)", 0)
-COMP(1986, nms8250f, nms8255, 0, nms8250f, msx2, driver_device, 0, "Philips", "NMS-8250F (MSX2)", 0) // French keyboard
-COMP(19??, nms8250j, nms8255, 0, nms8250j, msx2jp, driver_device, 0, "Philips", "NMS-8250J (MSX2)", 0)
-COMP(1986, nms8255, 0, 0, nms8255, msx2, driver_device, 0, "Philips", "NMS-8255 (MSX2)", 0)
-COMP(1986, nms8255f, nms8255, 0, nms8255f, msx2, driver_device, 0, "Philips", "NMS-8255F (MSX2)", 0) // French keyboard
-COMP(1986, nms8260, 0, 0, nms8260, msx2, driver_device, 0, "Philips", "NMS-8260 (Prototype) (MSX2)", MACHINE_NOT_WORKING)
-COMP(1986, nms8280, 0, 0, nms8280, msx2, driver_device, 0, "Philips", "NMS-8280 (MSX2)", 0)
-COMP(1986, nms8280f, nms8280, 0, nms8280f, msx2, driver_device, 0, "Philips", "NMS-8280F (MSX2)", 0) // French keyboard
-COMP(1986, nms8280g, nms8280, 0, nms8280g, msx2, driver_device, 0, "Philips", "NMS-8280G (MSX2)", 0)
-COMP(19??, mpc2300, 0, 0, mpc2300, msx2, driver_device, 0, "Sanyo", "MPC-2300 (MSX2)", MACHINE_NOT_WORKING) // Keyboard responds differently
-COMP(198?, mpc2500f, 0, 0, mpc2500f, msx2, driver_device, 0, "Sanyo", "MPC-2500FD (MSX2)", MACHINE_NOT_WORKING) // Russian keyboard?
-COMP(19??, mpc25fd, 0, 0, mpc25fd, msx2, driver_device, 0, "Sanyo", "Wavy MPC-25FD (MSX2)", 0)
-COMP(198?, mpc27, 0, 0, mpc27, msx2jp, driver_device, 0, "Sanyo", "Wavy MPC-27 (MSX2)", MACHINE_NOT_WORKING) // Light pen not emulated
-COMP(1988, phc23, 0, 0, phc23, msx2jp, driver_device, 0, "Sanyo", "Wavy PHC-23 (Japan) (MSX2)", 0)
-COMP(198?, phc55fd2, 0, 0, phc55fd2, msx2jp, driver_device, 0, "Sanyo", "Wavy PHC-55FD2 (MSX2)", 0)
-COMP(198?, phc77, 0, 0, phc77, msx2jp, driver_device, 0, "Sanyo", "Wavy PHC-77 (MSX2)", MACHINE_NOT_WORKING) // Firmware not emulated
-COMP(1986, hbf1, 0, 0, hbf1, msx2jp, driver_device, 0, "Sony", "HB-F1 (Japan) (MSX2)", MACHINE_NOT_WORKING ) // Screen stays a single color after a while
-COMP(1987, hbf12, 0, 0, hbf12, msx2jp, driver_device, 0, "Sony", "HB-F1II (Japan) (MSX2)", MACHINE_NOT_WORKING ) // Screen stays a single color after a while
-COMP(1987, hbf1xd, 0, 0, hbf1xd, msx2jp, driver_device, 0, "Sony", "HB-F1XD (Japan) (MSX2)", 0)
-COMP(1988, hbf1xdm2, 0, 0, hbf1xdm2, msx2jp, driver_device, 0, "Sony", "HB-F1XDMK2 (Japan) (MSX2)", 0)
-COMP(19??, hbf5, 0, 0, hbf5, msx2, driver_device, 0, "Sony", "HB-F5 (MSX2)", 0)
-COMP(1985, hbf9p, 0, 0, hbf9p, msx2, driver_device, 0, "Sony", "HB-F9P (MSX2)", 0)
-COMP(19??, hbf9pr, hbf9p, 0, hbf9pr, msx2, driver_device, 0, "Sony", "HB-F9P Russion (MSX2)", MACHINE_NOT_WORKING) // Keyboard responds differently
-COMP(1985, hbf9s, hbf9p, 0, hbf9s, msx2, driver_device, 0, "Sony", "HB-F9S (MSX2)", 0)
-COMP(1986, hbf500, hbf500p, 0, hbf500, msx2jp, driver_device, 0, "Sony", "HB-F500 (Japan) (MSX2)", 0)
-COMP(198?, hbf500f, hbf500p, 0, hbf500f, msx2, driver_device, 0, "Sony", "HB-F500F (MSX2)", 0) // French keyboard?
-COMP(1985, hbf500p, 0, 0, hbf500p, msx2, driver_device, 0, "Sony", "HB-F500P (MSX2)", 0)
-COMP(1985, hbf700d, hbf700p, 0, hbf700d, msx2, driver_device, 0, "Sony", "HB-F700D (Germany) (MSX2)", 0)
-COMP(1985, hbf700f, hbf700p, 0, hbf700f, msx2, driver_device, 0, "Sony", "HB-F700F (MSX2)", 0)
-COMP(1985, hbf700p, 0, 0, hbf700p, msx2, driver_device, 0, "Sony", "HB-F700P (MSX2)", 0)
-COMP(1985, hbf700s, hbf700p, 0, hbf700s, msx2, driver_device, 0, "Sony", "HB-F700S (Spain) (MSX2)", 0)
-COMP(1986, hbf900, hbf900a, 0, hbf900, msx2jp, driver_device, 0, "Sony", "HB-F900 / 1st released version (Japan) (MSX2)", 0)
-COMP(1986, hbf900a, 0, 0, hbf900a, msx2jp, driver_device, 0, "Sony", "HB-F900 / 2nd released version (Japan) (MSX2)", 0)
-COMP(1986, hbg900ap, hbg900p, 0, hbg900ap, msx2, driver_device, 0, "Sony", "HB-G900AP (MSX2)", 0 )
-COMP(1986, hbg900p, 0, 0, hbg900p, msx2, driver_device, 0, "Sony", "HB-G900P (MSX2)", 0 )
-COMP(1986, hotbit20, 0, 0, hotbit20, msx2, driver_device, 0, "Sharp / Epcom", "HB-8000 Hotbit 2.0 (MSX2)", 0) // Black screen
-COMP(1986, tpc310, 0, 0, tpc310, msx2, driver_device, 0, "Talent", "TPC-310 (MSX2)", 0)
-COMP(19??, tpp311, 0, 0, tpp311, msx2, driver_device, 0, "Talent", "TPP-311 (MSX2)", 0)
-COMP(19??, tps312, 0, 0, tps312, msx2, driver_device, 0, "Talent", "TPS-312 (MSX2)", 0)
-COMP(1986, hx23, hx23i, 0, hx23, msx2, driver_device, 0, "Toshiba", "HX-23 (MSX2)", 0)
-COMP(1986, hx23f, hx23i, 0, hx23f, msx2, driver_device, 0, "Toshiba", "HX-23F (MSX2)", 0)
-COMP(19??, hx23i, 0, 0, hx23i, msx2, driver_device, 0, "Toshiba", "HX-23I (MSX2)", 0)
-COMP(1985, hx33, 0, 0, hx33, msx2jp, driver_device, 0, "Toshiba", "HX-33 (MSX2)", 0)
-COMP(1985, hx34, hx34i, 0, hx34, msx2jp, driver_device, 0, "Toshiba", "HX-34 (MSX2)", 0)
-COMP(1985, hx34i, 0, 0, hx34i, msx, driver_device, 0, "Toshiba", "HX-34I (MSX2)", 0)
-COMP(1985, fstm1, 0, 0, fstm1, msx, driver_device, 0, "Toshiba", "FS-TM1 (MSX2)", 0)
-COMP(198?, victhc90, victhc95, 0, victhc90, msxjp, driver_device, 0, "Victor", "HC-90 (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
-COMP(1986, victhc95, 0, 0, victhc95, msxjp, driver_device, 0, "Victor", "HC-95 (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
-COMP(1986, victhc95a, victhc95, 0, victhc95a, msxjp, driver_device, 0, "Victor", "HC-95A (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
-COMP(1986, cx7m, cx7m128, 0, cx7m, msx2, driver_device, 0, "Yamaha", "CX7M (MSX2)", 0)
-COMP(1986, cx7m128, 0, 0, cx7m128, msx2, driver_device, 0, "Yamaha", "CX7M/128 (MSX2)", 0)
-COMP(198?, y503iiir, 0, 0, y503iiir, msx2, driver_device, 0, "Yamaha", "YIS-503 III R (Russian) (MSX2)", MACHINE_NOT_WORKING) // Russian keyboard, floppy support broken
-COMP(198?, y503iiire, y503iiir, 0, y503iiire, msx2, driver_device, 0, "Yamaha", "YIS-503 III R (Estonian) (MSX2)", MACHINE_NOT_WORKING) // Russian/Estonian keyboard, floppy support broken
-COMP(1985, yis60464, yis604, 0, yis60464, msx2jp, driver_device, 0, "Yamaha", "YIS604 (64KB) (MSX2)", 0)
-COMP(1985, yis604, 0, 0, yis604, msx2jp, driver_device, 0, "Yamaha", "YIS604 (128KB) (MSX2)", 0)
-COMP(198?, y805128, y805256, 0, y805128, msx2jp, driver_device, 0, "Yamaha", "YIS805/128 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
-COMP(198?, y805128r2, y805256, 0, y805128r2, msx2jp, driver_device, 0, "Yamaha", "YIS805R2/128 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
-COMP(198?, y805128r2e, y805256, 0, y805128r2e, msx2jp, driver_device, 0, "Yamaha", "YIS805R2/128 (Estonian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
-COMP(198?, y805256, 0, 0, y805256, msx2jp, driver_device, 0, "Yamaha", "YIS805/256 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
+COMP(1986, ax350, 0, 0, ax350, msx2, msx_state, 0, "Al Alamiah", "AX-350 (Arabic) (MSX2)", 0)
+COMP(1986, ax370, 0, 0, ax370, msx2, msx_state, 0, "Al Alamiah", "AX-370 (Arabic) (MSX2)", 0)
+COMP(1985, canonv25, 0, 0, canonv25, msx2, msx_state, 0, "Canon", "V-25 (MSX2)", 0)
+COMP(1985, canonv30, 0, 0, canonv30, msx2, msx_state, 0, "Canon", "V-30 (MSX2)", 0)
+COMP(1985, canonv30f, canonv30, 0, canonv30f, msx2, msx_state, 0, "Canon", "V-30F (MSX2)", 0)
+COMP(1986, cpc300, 0, 0, cpc300, msx2kr, msx_state, 0, "Daewoo", "IQ-2000 CPC-300 (Korea) (MSX2)", 0)
+COMP(1986, cpc300e, 0, 0, cpc300e, msx2kr, msx_state, 0, "Daewoo", "IQ-2000 CPC-300E (Korea) (MSX2)", 0)
+COMP(1985, cpc330k, 0, 0, cpc330k, msx2kr, msx_state, 0, "Daewoo", "CPC-330K KOBO (Korea) (MSX2)", 0)
+COMP(1988, cpc400, 0, 0, cpc400, msx2kr, msx_state, 0, "Daewoo", "X-II CPC-400 (Korea) (MSX2)", 0)
+COMP(1988, cpc400s, 0, 0, cpc400s, msx2kr, msx_state, 0, "Daewoo", "X-II CPC-400S (Korea) (MSX2)", 0)
+COMP(1990, cpc61, 0, 0, cpc61, msx2kr, msx_state, 0, "Daewoo", "Zemmix CPC-61 (Korea) (MSX2)", 0)
+COMP(1991, cpg120, 0, 0, cpg120, msx2kr, msx_state, 0, "Daewoo", "Zemmix CPG-120 Normal (Korea) (MSX2)", MACHINE_NOT_WORKING) // v9958 not added
+COMP(198?, fpc900, 0, 0, fpc900, msx2, msx_state, 0, "Fenner", "FPC-900 (MSX2)", 0)
+COMP(1986, expert20, 0, 0, expert20, msx2, msx_state, 0, "Gradiente", "Expert 2.0 (Brazil) (MSX2)", 0)
+COMP(198?, mbh70, 0, 0, mbh70, msx2jp, msx_state, 0, "Hitachi", "MB-H70 (MSX2)", MACHINE_NOT_WORKING) // Firmware not working
+COMP(1987, kmc5000, 0, 0, kmc5000, msx2jp, msx_state, 0, "Kawai", "KMC-5000 (MSX2)", 0)
+COMP(1985, mlg1, 0, 0, mlg1, msx2, msx_state, 0, "Mitsubishi", "ML-G1 (MSX2)", 0)
+COMP(198?, mlg3, 0, 0, mlg3, msx2, msx_state, 0, "Mitsubishi", "ML-G3 (MSX2)", 0)
+COMP(1985, mlg10, 0, 0, mlg10, msx2jp, msx_state, 0, "Mitsubishi", "ML-G10 (MSX2)", 0)
+COMP(1983, mlg30, 0, 0, mlg30, msx2, msx_state, 0, "Mitsubishi", "ML-G30 (MSX2)", 0)
+COMP(1985, fs5500f1, fs5500f2, 0, fs5500f1, msx2jp, msx_state, 0, "National / Matsushita", "FS-5500F1 (Japan) (MSX2)", 0)
+COMP(1985, fs5500f2, 0, 0, fs5500f2, msx2jp, msx_state, 0, "National / Matsushita", "FS-5500F2 (Japan) (MSX2)", 0)
+COMP(1986, fs4500, 0, 0, fs4500, msx2jp, msx_state, 0, "National / Matsushita", "FS-4500 (Japan) (MSX2)", 0)
+COMP(1986, fs4700, 0, 0, fs4700, msx2jp, msx_state, 0, "National / Matsushita", "FS-4700 (Japan) (MSX2)", 0)
+COMP(1986, fs5000, 0, 0, fs5000, msx2jp, msx_state, 0, "National / Matsushita", "FS-5000F2 (Japan) (MSX2)", 0)
+COMP(1986, fs4600, 0, 0, fs4600, msx2jp, msx_state, 0, "National / Matsushita", "FS-4600 (Japan) (MSX2)", 0)
+COMP(1986, fsa1, fsa1a, 0, fsa1, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1 / 1st released version (Japan) (MSX2)", 0)
+COMP(1986, fsa1a, 0, 0, fsa1a, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1 / 2nd released version (Japan) (MSX2)", 0)
+COMP(1987, fsa1mk2, 0, 0, fsa1mk2, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1MK2 (Japan) (MSX2)", 0)
+COMP(1987, fsa1f, 0, 0, fsa1f, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1F (Japan) (MSX2)", 0)
+COMP(1987, fsa1fm, 0, 0, fsa1fm, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1FM (Japan) (MSX2)", 0)
+COMP(1986, nms8220, nms8220a, 0, nms8220, msx2, msx_state, 0, "Philips", "NMS-8220 (12-jun-1986) (MSX2)", 0)
+COMP(1986, nms8220a, 0, 0, nms8220a, msx2, msx_state, 0, "Philips", "NMS-8220 (13-aug-1986) (MSX2)", 0)
+COMP(1986, vg8230, 0, 0, vg8230, msx2, msx_state, 0, "Philips", "VG-8230 (MSX2)", 0)
+COMP(19??, vg8230j, vg8230, 0, vg8230j, msx2jp, msx_state, 0, "Philips", "VG-8230J (MSX2)", MACHINE_NOT_WORKING) // Screen flashes a few times before going into basic
+COMP(1986, vg8235, 0, 0, vg8235, msx2, msx_state, 0, "Philips", "VG-8235 (MSX2)", 0)
+COMP(1986, vg8235f, vg8235, 0, vg8235f, msx2, msx_state, 0, "Philips", "VG-8235F (MSX2)", 0)
+COMP(1986, vg8240, 0, 0, vg8240, msx2, msx_state, 0, "Philips", "VG-8240 (MSX2)", 0)
+COMP(1986, nms8245, 0, 0, nms8245, msx2, msx_state, 0, "Philips", "NMS-8245 (MSX2)", 0)
+COMP(1986, nms8245f, nms8245, 0, nms8245f, msx2, msx_state, 0, "Philips", "NMS-8245F (MSX2)", 0)
+COMP(1986, nms8250, nms8255, 0, nms8250, msx2, msx_state, 0, "Philips", "NMS-8250 (MSX2)", 0)
+COMP(1986, nms8250f, nms8255, 0, nms8250f, msx2, msx_state, 0, "Philips", "NMS-8250F (MSX2)", 0) // French keyboard
+COMP(19??, nms8250j, nms8255, 0, nms8250j, msx2jp, msx_state, 0, "Philips", "NMS-8250J (MSX2)", 0)
+COMP(1986, nms8255, 0, 0, nms8255, msx2, msx_state, 0, "Philips", "NMS-8255 (MSX2)", 0)
+COMP(1986, nms8255f, nms8255, 0, nms8255f, msx2, msx_state, 0, "Philips", "NMS-8255F (MSX2)", 0) // French keyboard
+COMP(1986, nms8260, 0, 0, nms8260, msx2, msx_state, 0, "Philips", "NMS-8260 (Prototype) (MSX2)", MACHINE_NOT_WORKING)
+COMP(1986, nms8280, 0, 0, nms8280, msx2, msx_state, 0, "Philips", "NMS-8280 (MSX2)", 0)
+COMP(1986, nms8280f, nms8280, 0, nms8280f, msx2, msx_state, 0, "Philips", "NMS-8280F (MSX2)", 0) // French keyboard
+COMP(1986, nms8280g, nms8280, 0, nms8280g, msx2, msx_state, 0, "Philips", "NMS-8280G (MSX2)", 0)
+COMP(19??, mpc2300, 0, 0, mpc2300, msx2, msx_state, 0, "Sanyo", "MPC-2300 (MSX2)", MACHINE_NOT_WORKING) // Keyboard responds differently
+COMP(198?, mpc2500f, 0, 0, mpc2500f, msx2, msx_state, 0, "Sanyo", "MPC-2500FD (MSX2)", MACHINE_NOT_WORKING) // Russian keyboard?
+COMP(19??, mpc25fd, 0, 0, mpc25fd, msx2, msx_state, 0, "Sanyo", "Wavy MPC-25FD (MSX2)", 0)
+COMP(198?, mpc27, 0, 0, mpc27, msx2jp, msx_state, 0, "Sanyo", "Wavy MPC-27 (MSX2)", MACHINE_NOT_WORKING) // Light pen not emulated
+COMP(1988, phc23, 0, 0, phc23, msx2jp, msx_state, 0, "Sanyo", "Wavy PHC-23 (Japan) (MSX2)", 0)
+COMP(198?, phc55fd2, 0, 0, phc55fd2, msx2jp, msx_state, 0, "Sanyo", "Wavy PHC-55FD2 (MSX2)", 0)
+COMP(198?, phc77, 0, 0, phc77, msx2jp, msx_state, 0, "Sanyo", "Wavy PHC-77 (MSX2)", MACHINE_NOT_WORKING) // Firmware not emulated
+COMP(1986, hbf1, 0, 0, hbf1, msx2jp, msx_state, 0, "Sony", "HB-F1 (Japan) (MSX2)", MACHINE_NOT_WORKING ) // Screen stays a single color after a while
+COMP(1987, hbf12, 0, 0, hbf12, msx2jp, msx_state, 0, "Sony", "HB-F1II (Japan) (MSX2)", MACHINE_NOT_WORKING ) // Screen stays a single color after a while
+COMP(1987, hbf1xd, 0, 0, hbf1xd, msx2jp, msx_state, 0, "Sony", "HB-F1XD (Japan) (MSX2)", 0)
+COMP(1988, hbf1xdm2, 0, 0, hbf1xdm2, msx2jp, msx_state, 0, "Sony", "HB-F1XDMK2 (Japan) (MSX2)", 0)
+COMP(19??, hbf5, 0, 0, hbf5, msx2, msx_state, 0, "Sony", "HB-F5 (MSX2)", 0)
+COMP(1985, hbf9p, 0, 0, hbf9p, msx2, msx_state, 0, "Sony", "HB-F9P (MSX2)", 0)
+COMP(19??, hbf9pr, hbf9p, 0, hbf9pr, msx2, msx_state, 0, "Sony", "HB-F9P Russion (MSX2)", MACHINE_NOT_WORKING) // Keyboard responds differently
+COMP(1985, hbf9s, hbf9p, 0, hbf9s, msx2, msx_state, 0, "Sony", "HB-F9S (MSX2)", 0)
+COMP(1986, hbf500, hbf500p, 0, hbf500, msx2jp, msx_state, 0, "Sony", "HB-F500 (Japan) (MSX2)", 0)
+COMP(198?, hbf500f, hbf500p, 0, hbf500f, msx2, msx_state, 0, "Sony", "HB-F500F (MSX2)", 0) // French keyboard?
+COMP(1985, hbf500p, 0, 0, hbf500p, msx2, msx_state, 0, "Sony", "HB-F500P (MSX2)", 0)
+COMP(1985, hbf700d, hbf700p, 0, hbf700d, msx2, msx_state, 0, "Sony", "HB-F700D (Germany) (MSX2)", 0)
+COMP(1985, hbf700f, hbf700p, 0, hbf700f, msx2, msx_state, 0, "Sony", "HB-F700F (MSX2)", 0)
+COMP(1985, hbf700p, 0, 0, hbf700p, msx2, msx_state, 0, "Sony", "HB-F700P (MSX2)", 0)
+COMP(1985, hbf700s, hbf700p, 0, hbf700s, msx2, msx_state, 0, "Sony", "HB-F700S (Spain) (MSX2)", 0)
+COMP(1986, hbf900, hbf900a, 0, hbf900, msx2jp, msx_state, 0, "Sony", "HB-F900 / 1st released version (Japan) (MSX2)", 0)
+COMP(1986, hbf900a, 0, 0, hbf900a, msx2jp, msx_state, 0, "Sony", "HB-F900 / 2nd released version (Japan) (MSX2)", 0)
+COMP(1986, hbg900ap, hbg900p, 0, hbg900ap, msx2, msx_state, 0, "Sony", "HB-G900AP (MSX2)", 0 )
+COMP(1986, hbg900p, 0, 0, hbg900p, msx2, msx_state, 0, "Sony", "HB-G900P (MSX2)", 0 )
+COMP(1986, hotbit20, 0, 0, hotbit20, msx2, msx_state, 0, "Sharp / Epcom", "HB-8000 Hotbit 2.0 (MSX2)", 0) // Black screen
+COMP(1986, tpc310, 0, 0, tpc310, msx2, msx_state, 0, "Talent", "TPC-310 (MSX2)", 0)
+COMP(19??, tpp311, 0, 0, tpp311, msx2, msx_state, 0, "Talent", "TPP-311 (MSX2)", 0)
+COMP(19??, tps312, 0, 0, tps312, msx2, msx_state, 0, "Talent", "TPS-312 (MSX2)", 0)
+COMP(1986, hx23, hx23i, 0, hx23, msx2, msx_state, 0, "Toshiba", "HX-23 (MSX2)", 0)
+COMP(1986, hx23f, hx23i, 0, hx23f, msx2, msx_state, 0, "Toshiba", "HX-23F (MSX2)", 0)
+COMP(19??, hx23i, 0, 0, hx23i, msx2, msx_state, 0, "Toshiba", "HX-23I (MSX2)", 0)
+COMP(1985, hx33, 0, 0, hx33, msx2jp, msx_state, 0, "Toshiba", "HX-33 (MSX2)", 0)
+COMP(1985, hx34, hx34i, 0, hx34, msx2jp, msx_state, 0, "Toshiba", "HX-34 (MSX2)", 0)
+COMP(1985, hx34i, 0, 0, hx34i, msx, msx_state, 0, "Toshiba", "HX-34I (MSX2)", 0)
+COMP(1985, fstm1, 0, 0, fstm1, msx, msx_state, 0, "Toshiba", "FS-TM1 (MSX2)", 0)
+COMP(198?, victhc90, victhc95, 0, victhc90, msxjp, msx_state, 0, "Victor", "HC-90 (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
+COMP(1986, victhc95, 0, 0, victhc95, msxjp, msx_state, 0, "Victor", "HC-95 (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
+COMP(1986, victhc95a, victhc95, 0, victhc95a, msxjp, msx_state, 0, "Victor", "HC-95A (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
+COMP(1986, cx7m, cx7m128, 0, cx7m, msx2, msx_state, 0, "Yamaha", "CX7M (MSX2)", 0)
+COMP(1986, cx7m128, 0, 0, cx7m128, msx2, msx_state, 0, "Yamaha", "CX7M/128 (MSX2)", 0)
+COMP(198?, y503iiir, 0, 0, y503iiir, msx2, msx_state, 0, "Yamaha", "YIS-503 III R (Russian) (MSX2)", MACHINE_NOT_WORKING) // Russian keyboard, floppy support broken
+COMP(198?, y503iiire, y503iiir, 0, y503iiire, msx2, msx_state, 0, "Yamaha", "YIS-503 III R (Estonian) (MSX2)", MACHINE_NOT_WORKING) // Russian/Estonian keyboard, floppy support broken
+COMP(1985, yis60464, yis604, 0, yis60464, msx2jp, msx_state, 0, "Yamaha", "YIS604 (64KB) (MSX2)", 0)
+COMP(1985, yis604, 0, 0, yis604, msx2jp, msx_state, 0, "Yamaha", "YIS604 (128KB) (MSX2)", 0)
+COMP(198?, y805128, y805256, 0, y805128, msx2jp, msx_state, 0, "Yamaha", "YIS805/128 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
+COMP(198?, y805128r2, y805256, 0, y805128r2, msx2jp, msx_state, 0, "Yamaha", "YIS805R2/128 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
+COMP(198?, y805128r2e, y805256, 0, y805128r2e, msx2jp, msx_state, 0, "Yamaha", "YIS805R2/128 (Estonian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
+COMP(198?, y805256, 0, 0, y805256, msx2jp, msx_state, 0, "Yamaha", "YIS805/256 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
/* MSX2+ */
-COMP(19??, expert3i, 0, 0, expert3i, msx2, driver_device, 0, "Ciel", "Expert 3 IDE (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
-COMP(1996, expert3t, 0, 0, expert3t, msx2, driver_device, 0, "Ciel", "Expert 3 Turbo (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
-COMP(19??, expertac, 0, 0, expertac, msx2, driver_device, 0, "Gradiente", "Expert AC88+ (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
-COMP(19??, expertdx, 0, 0, expertdx, msx2, driver_device, 0, "Gradiente", "Expert DDX+ (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
-COMP(1988, fsa1fx, 0, 0, fsa1fx, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1FX (Japan) (MSX2+)", 0 )
-COMP(1988, fsa1wx, fsa1wxa, 0, fsa1wx, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1WX / 1st released version (Japan) (MSX2+)", 0 )
-COMP(1988, fsa1wxa, 0, 0, fsa1wxa, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1WX / 2nd released version (Japan) (MSX2+)", 0 )
-COMP(1989, fsa1wsx, 0, 0, fsa1wsx, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1WSX (Japan) (MSX2+)", 0 )
-COMP(1988, hbf1xdj, 0, 0, hbf1xdj, msx2jp, driver_device, 0, "Sony", "HB-F1XDJ (Japan) (MSX2+)", 0 )
-COMP(1989, hbf1xv, 0, 0, hbf1xv, msx2jp, driver_device, 0, "Sony", "HB-F1XV (Japan) (MSX2+)", 0 )
-COMP(1988, phc70fd, phc70fd2, 0, phc70fd, msx2jp, driver_device, 0, "Sanyo", "WAVY PHC-70FD (Japan) (MSX2+)", 0 )
-COMP(1988, phc70fd2, 0, 0, phc70fd2, msx2jp, driver_device, 0, "Sanyo", "WAVY PHC-70FD2 (Japan) (MSX2+)", 0 )
-COMP(1989, phc35j, 0, 0, phc35j, msx2jp, driver_device, 0, "Sanyo", "WAVY PHC-35J (Japan) (MSX2+)", 0)
-COMP(19??, hbf9sp, 0, 0, hbf9sp, msx2jp, driver_device, 0, "Sony", "HB-F9S+ (MSX2+)", 0)
+COMP(19??, expert3i, 0, 0, expert3i, msx2, msx_state, 0, "Ciel", "Expert 3 IDE (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
+COMP(1996, expert3t, 0, 0, expert3t, msx2, msx_state, 0, "Ciel", "Expert 3 Turbo (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
+COMP(19??, expertac, 0, 0, expertac, msx2, msx_state, 0, "Gradiente", "Expert AC88+ (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
+COMP(19??, expertdx, 0, 0, expertdx, msx2, msx_state, 0, "Gradiente", "Expert DDX+ (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
+COMP(1988, fsa1fx, 0, 0, fsa1fx, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1FX (Japan) (MSX2+)", 0 )
+COMP(1988, fsa1wx, fsa1wxa, 0, fsa1wx, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1WX / 1st released version (Japan) (MSX2+)", 0 )
+COMP(1988, fsa1wxa, 0, 0, fsa1wxa, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1WX / 2nd released version (Japan) (MSX2+)", 0 )
+COMP(1989, fsa1wsx, 0, 0, fsa1wsx, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1WSX (Japan) (MSX2+)", 0 )
+COMP(1988, hbf1xdj, 0, 0, hbf1xdj, msx2jp, msx_state, 0, "Sony", "HB-F1XDJ (Japan) (MSX2+)", 0 )
+COMP(1989, hbf1xv, 0, 0, hbf1xv, msx2jp, msx_state, 0, "Sony", "HB-F1XV (Japan) (MSX2+)", 0 )
+COMP(1988, phc70fd, phc70fd2, 0, phc70fd, msx2jp, msx_state, 0, "Sanyo", "WAVY PHC-70FD (Japan) (MSX2+)", 0 )
+COMP(1988, phc70fd2, 0, 0, phc70fd2, msx2jp, msx_state, 0, "Sanyo", "WAVY PHC-70FD2 (Japan) (MSX2+)", 0 )
+COMP(1989, phc35j, 0, 0, phc35j, msx2jp, msx_state, 0, "Sanyo", "WAVY PHC-35J (Japan) (MSX2+)", 0)
+COMP(19??, hbf9sp, 0, 0, hbf9sp, msx2jp, msx_state, 0, "Sony", "HB-F9S+ (MSX2+)", 0)
/* MSX Turbo-R */
/* Temporary placeholders, Turbo-R hardware is not supported yet */
-COMP(19??, fsa1gt, 0, 0, fsa1gt, msx2jp, driver_device, 0, "Panasonic", "FS-A1GT (MSX Turbo-R)", MACHINE_NOT_WORKING)
-COMP(19??, fsa1st, 0, 0, fsa1st, msx2jp, driver_device, 0, "Panasonic", "FS-A1ST (MSX Turbo-R)", MACHINE_NOT_WORKING)
+COMP(19??, fsa1gt, 0, 0, fsa1gt, msx2jp, msx_state, 0, "Panasonic", "FS-A1GT (MSX Turbo-R)", MACHINE_NOT_WORKING)
+COMP(19??, fsa1st, 0, 0, fsa1st, msx2jp, msx_state, 0, "Panasonic", "FS-A1ST (MSX Turbo-R)", MACHINE_NOT_WORKING)