diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp
index c13f0a56d59..2529508e2b3 100644
--- a/src/mame/drivers/svi318.cpp
+++ b/src/mame/drivers/svi318.cpp
@@ -1,620 +1,498 @@
-// license:BSD-3-Clause
-// copyright-holders:Sean Young
-/*
-** svi318.c : driver for Spectravideo SVI-318 and SVI-328
-**
-** Information taken from: http://www.samdal.com/sv318.htm
-**
-** SV-318 : 16KB Video RAM, 16KB RAM
-** SV-328 : 16KB Video RAM, 64KB RAM
-*/
-
-#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "machine/i8255.h"
-#include "machine/ins8250.h"
-#include "machine/wd_fdc.h"
-#include "machine/ram.h"
-#include "machine/buffer.h"
-#include "imagedev/cassette.h"
-#include "sound/dac.h"
-#include "sound/ay8910.h"
-#include "sound/wave.h"
-#include "video/mc6845.h"
-#include "video/tms9928a.h"
-#include "bus/centronics/ctronics.h"
-#include "bus/generic/slot.h"
-#include "bus/generic/carts.h"
-#include "imagedev/flopdrv.h"
-#include "formats/svi_dsk.h"
-#include "formats/svi_cas.h"
-#include "softlist.h"
-#include "rendlay.h"
-
-
-class svi318_state : public driver_device
-{
-public:
-	svi318_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_cassette(*this, "cassette"),
-		m_dac(*this, "dac"),
-		m_ppi(*this, "ppi8255"),
-		m_ram(*this, RAM_TAG),
-		m_centronics(*this, "centronics"),
-		m_cent_data_out(*this, "cent_data_out"),
-		m_ins8250_0(*this, "ins8250_0"),
-		m_ins8250_1(*this, "ins8250_1"),
-		m_cart(*this, "cartslot"),
-		m_fd1793(*this, "wd179x"),
-		m_floppy0(*this, "wd179x:0"),
-		m_floppy1(*this, "wd179x:1"),
-//		m_crtc(*this, "crtc"),
-		m_line(*this, "LINE"),
-		m_joysticks(*this, "JOYSTICKS"),
-		m_buttons(*this, "BUTTONS"),
-		m_palette(*this, "palette"),
-		m_bank1(*this, "bank1"),
-		m_bank2(*this, "bank2"),
-		m_bank3(*this, "bank3"),
-		m_bank4(*this, "bank4")
-	{ }
-
-	DECLARE_FLOPPY_FORMATS(floppy_formats);
-
-	DECLARE_WRITE_LINE_MEMBER(vdp_interrupt);
-	// FDC
-	int m_drq;
-	int m_irq;
-	
-	memory_region *m_cart_rom;
-	memory_region *m_bios_rom;
-
-protected:
-	required_device<z80_device> m_maincpu;
-	required_device<cassette_image_device> m_cassette;
-	required_device<dac_device> m_dac;
-	required_device<i8255_device> m_ppi;
-	required_device<ram_device> m_ram;
-	required_device<centronics_device> m_centronics;
-	required_device<output_latch_device> m_cent_data_out;
-	required_device<ins8250_device> m_ins8250_0;
-	required_device<ins8250_device> m_ins8250_1;
-	required_device<generic_slot_device> m_cart;
-	required_device<fd1793_t> m_fd1793;
-	required_device<floppy_connector> m_floppy0;
-	required_device<floppy_connector> m_floppy1;
-	//optional_device<mc6845_device> m_crtc;
-	required_ioport_array<11> m_line;
-	required_ioport m_joysticks;
-	required_ioport m_buttons;
-	optional_device<palette_device> m_palette;
-
-private:
-	optional_memory_bank m_bank1;
-	optional_memory_bank m_bank2;
-	optional_memory_bank m_bank3;
-	optional_memory_bank m_bank4;
-};
-
-static ADDRESS_MAP_START( svi318_mem, AS_PROGRAM, 8, svi318_state )
-	//AM_RANGE(0x0000, 0x7fff) AM_READ_BANK("bank1") AM_WRITE(writemem1)
-	//AM_RANGE(0x8000, 0xbfff) AM_READ_BANK("bank2") AM_WRITE(writemem2)
-	//AM_RANGE(0xc000, 0xffff) AM_READ_BANK("bank3") AM_WRITE(writemem3)
-ADDRESS_MAP_END
-
-static ADDRESS_MAP_START( svi328_806_mem, AS_PROGRAM, 8, svi318_state )
-	//AM_RANGE(0x0000, 0x7fff) AM_READ_BANK("bank1") AM_WRITE(writemem1)
-	//AM_RANGE(0x8000, 0xbfff) AM_READ_BANK("bank2") AM_WRITE(writemem2)
-	//AM_RANGE(0xc000, 0xefff) AM_READ_BANK("bank3") AM_WRITE(writemem3)
-	//AM_RANGE(0xf000, 0xffff) AM_READ_BANK("bank4") AM_WRITE(writemem4)
-ADDRESS_MAP_END
-
-static ADDRESS_MAP_START( svi318_io, AS_IO, 8, svi318_state )
-	ADDRESS_MAP_UNMAP_HIGH
-	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	//AM_RANGE(0x00, 0x38) AM_READWRITE(io_ext_r, io_ext_w )
-	//AM_RANGE(0x80, 0x80) AM_DEVWRITE("tms9928a", tms9928a_device, vram_write)
-	//AM_RANGE(0x81, 0x81) AM_DEVWRITE("tms9928a", tms9928a_device, register_write)
-	//AM_RANGE(0x84, 0x84) AM_DEVREAD("tms9928a", tms9928a_device, vram_read)
-	//AM_RANGE(0x85, 0x85) AM_DEVREAD("tms9928a", tms9928a_device, register_read)
-	AM_RANGE(0x88, 0x88) AM_DEVWRITE("ay8910", ay8910_device, address_w)
-	AM_RANGE(0x8c, 0x8c) AM_DEVWRITE("ay8910", ay8910_device, data_w)
-	AM_RANGE(0x90, 0x90) AM_DEVREAD("ay8910", ay8910_device, data_r)
-	//AM_RANGE(0x96, 0x97) AM_WRITE(ppi_w)
-	AM_RANGE(0x98, 0x9a) AM_DEVREAD("ppi8255", i8255_device, read)
-ADDRESS_MAP_END
-
-static ADDRESS_MAP_START( svi328_806_io, AS_IO, 8, svi318_state )
-	ADDRESS_MAP_UNMAP_HIGH
-	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	//AM_RANGE(0x00, 0x58) AM_READWRITE(io_ext_r, io_ext_w )
-	//AM_RANGE(0x80, 0x80) AM_DEVWRITE("tms9928a", tms9928a_device, vram_write)
-	//AM_RANGE(0x81, 0x81) AM_DEVWRITE("tms9928a", tms9928a_device, register_write)
-	//AM_RANGE(0x84, 0x84) AM_DEVREAD("tms9928a", tms9928a_device, vram_read)
-	//AM_RANGE(0x85, 0x85) AM_DEVREAD("tms9928a", tms9928a_device, register_read)
-	AM_RANGE(0x88, 0x88) AM_DEVWRITE("ay8910", ay8910_device, address_w)
-	AM_RANGE(0x8c, 0x8c) AM_DEVWRITE("ay8910", ay8910_device, data_w)
-	AM_RANGE(0x90, 0x90) AM_DEVREAD("ay8910", ay8910_device, data_r)
-	//AM_RANGE(0x96, 0x97) AM_WRITE(ppi_w)
-	AM_RANGE(0x98, 0x9a) AM_DEVREAD("ppi8255", i8255_device, read)
-ADDRESS_MAP_END
-
-/*
-  Keyboard status table
-       Bit#:|  7  |  6  |  5  |  4  |  3  |  2  |  1  |  0  |
-            |     |     |     |     |     |     |     |     |
-  Line:     |     |     |     |     |     |     |     |     |
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-    0       | "7" | "6" | "5" | "4" | "3" | "2" | "1" | "0" |
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-    1       | "/" | "." | "=" | "," | "'" | ":" | "9" | "8" |
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-    2       | "G" | "F" | "E" | "D" | "C" | "B" | "A" | "-" |
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-    3       | "O" | "N" | "M" | "L" | "K" | "J" | "I" | "H" |
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-    4       | "W" | "V" | "U" | "T" | "S" | "R" | "Q" | "P" |
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-    5       | UP  | BS  | "]" | "\" | "[" | "Z" | "Y" | "X" |
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-    6       |LEFT |ENTER|STOP | ESC |RGRAP|LGRAP|CTRL |SHIFT|
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-    7       |DOWN | INS | CLS | F5  | F4  | F3  | F2  | F1  |
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-    8       |RIGHT|     |PRINT| SEL |CAPS | DEL | TAB |SPACE|
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-    9*      | "7" | "6" | "5" | "4" | "3" | "2" | "1" | "0" |
-   ---------+-----+-----+-----+-----+-----+-----+-----+-----|
-   10*      | "," | "." | "/" | "*" | "-" | "+" | "9" | "8" |
-   ----------------------------------------------------------
-   * Numcerical keypad (SVI-328 only)
-
-2008-05 FP:
-Small note about natural keyboard: currently,
-- "Keypad ," is not mapped
-- "Left Grph" and "Right Grph" are mapped to 'Page Up' and 'Page Down'
-- "Stop" is mapped to 'End'
-- "Select" is mapped to 'F11'
-- "CLS/HM" is mapped to 'Home'
-TODO: How are multiple keys (Copy, Cut, Paste, CLS/HM) expected to
-behave? Do they need multiple mapping in natural keyboard?
-*/
-
-static INPUT_PORTS_START( svi318 )
-	PORT_START("LINE.0")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)           PORT_CHAR('0') PORT_CHAR(')')
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)           PORT_CHAR('1') PORT_CHAR('!')
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)           PORT_CHAR('2') PORT_CHAR('@')
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)           PORT_CHAR('3') PORT_CHAR('#')
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)           PORT_CHAR('4') PORT_CHAR('$')
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)           PORT_CHAR('5') PORT_CHAR('%')
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)           PORT_CHAR('6') PORT_CHAR('^')
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)           PORT_CHAR('7') PORT_CHAR('&')
-
-	PORT_START("LINE.1")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)           PORT_CHAR('8') PORT_CHAR('*')
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)           PORT_CHAR('9') PORT_CHAR('(')
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)       PORT_CHAR(':') PORT_CHAR(';')
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)       PORT_CHAR('\'') PORT_CHAR('"')
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)       PORT_CHAR(',') PORT_CHAR('<')
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)      PORT_CHAR('=') PORT_CHAR('+')
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)        PORT_CHAR('.') PORT_CHAR('>')
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)       PORT_CHAR('/') PORT_CHAR('?')
-
-	PORT_START("LINE.2")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)       PORT_CHAR('-') PORT_CHAR('_')
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)           PORT_CHAR('a') PORT_CHAR('A')
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)           PORT_CHAR('b') PORT_CHAR('B')
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)           PORT_CHAR('c') PORT_CHAR('C')
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)           PORT_CHAR('d') PORT_CHAR('D')
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)           PORT_CHAR('e') PORT_CHAR('E')
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)           PORT_CHAR('f') PORT_CHAR('F')
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)           PORT_CHAR('g') PORT_CHAR('G')
-
-	PORT_START("LINE.3")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)           PORT_CHAR('h') PORT_CHAR('H')
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)           PORT_CHAR('i') PORT_CHAR('I')
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)           PORT_CHAR('0') PORT_CHAR('J')
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)           PORT_CHAR('k') PORT_CHAR('K')
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)           PORT_CHAR('l') PORT_CHAR('L')
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)           PORT_CHAR('m') PORT_CHAR('M')
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)           PORT_CHAR('n') PORT_CHAR('N')
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)           PORT_CHAR('o') PORT_CHAR('O')
-
-	PORT_START("LINE.4")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)           PORT_CHAR('p') PORT_CHAR('P')
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)           PORT_CHAR('q') PORT_CHAR('Q')
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)           PORT_CHAR('r') PORT_CHAR('R')
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)           PORT_CHAR('s') PORT_CHAR('S')
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)           PORT_CHAR('t') PORT_CHAR('T')
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)           PORT_CHAR('u') PORT_CHAR('U')
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)           PORT_CHAR('v') PORT_CHAR('V')
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)           PORT_CHAR('w') PORT_CHAR('W')
-
-	PORT_START("LINE.5")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)           PORT_CHAR('x') PORT_CHAR('X')
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)           PORT_CHAR('y') PORT_CHAR('Y')
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)           PORT_CHAR('z') PORT_CHAR('Z')
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)   PORT_CHAR('[') PORT_CHAR('{')
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)   PORT_CHAR('\\') PORT_CHAR('~')
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE)  PORT_CHAR(']') PORT_CHAR('}')
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE)   PORT_CHAR(8)
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(UTF8_UP) PORT_CODE(KEYCODE_UP)       PORT_CHAR(UCHAR_MAMEKEY(UP))
-
-	PORT_START("LINE.6")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT)    PORT_CHAR(UCHAR_SHIFT_1)
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL)          PORT_CHAR(UCHAR_SHIFT_2)
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left Grph") PORT_CODE(KEYCODE_LALT)         PORT_CHAR(UCHAR_MAMEKEY(PGUP))
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Right Grph") PORT_CODE(KEYCODE_RALT)       PORT_CHAR(UCHAR_MAMEKEY(PGDN))
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC)                                 PORT_CHAR(UCHAR_MAMEKEY(ESC))
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Stop") PORT_CODE(KEYCODE_END)               PORT_CHAR(UCHAR_MAMEKEY(END))
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER)                               PORT_CHAR(13)
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(UTF8_LEFT) PORT_CODE(KEYCODE_LEFT)       PORT_CHAR(UCHAR_MAMEKEY(LEFT))
-
-	PORT_START("LINE.7")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F1  F6") PORT_CODE(KEYCODE_F1)              PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CHAR(UCHAR_MAMEKEY(F6))
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F2  F7") PORT_CODE(KEYCODE_F2)              PORT_CHAR(UCHAR_MAMEKEY(F2)) PORT_CHAR(UCHAR_MAMEKEY(F7))
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F3  F8") PORT_CODE(KEYCODE_F3)              PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_CHAR(UCHAR_MAMEKEY(F8))
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F4  F9") PORT_CODE(KEYCODE_F4)              PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_CHAR(UCHAR_MAMEKEY(F9))
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F5  F10") PORT_CODE(KEYCODE_F5)             PORT_CHAR(UCHAR_MAMEKEY(F5)) PORT_CHAR(UCHAR_MAMEKEY(F10))
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("CLS/HM  Copy") PORT_CODE(KEYCODE_HOME)      PORT_CHAR(UCHAR_MAMEKEY(HOME))
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ins  Paste") PORT_CODE(KEYCODE_INSERT)      PORT_CHAR(UCHAR_MAMEKEY(INSERT))
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(UTF8_DOWN) PORT_CODE(KEYCODE_DOWN)       PORT_CHAR(UCHAR_MAMEKEY(DOWN))
-
-	PORT_START("LINE.8")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)                               PORT_CHAR(' ')
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB)                                 PORT_CHAR('\t')
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Del  Cut") PORT_CODE(KEYCODE_DEL)           PORT_CHAR(UCHAR_MAMEKEY(DEL))
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Caps Lock") PORT_CODE(KEYCODE_CAPSLOCK)     PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Select") PORT_CODE(KEYCODE_PAUSE)           PORT_CHAR(UCHAR_MAMEKEY(F11))
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Print") PORT_CODE(KEYCODE_PRTSCR)           PORT_CHAR(UCHAR_MAMEKEY(PRTSCR))
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(UTF8_RIGHT) PORT_CODE(KEYCODE_RIGHT)     PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
-
-	PORT_START("LINE.9")
-	PORT_BIT (0xff, IP_ACTIVE_LOW, IPT_UNUSED)
-
-	PORT_START("LINE.10")
-	PORT_BIT (0xff, IP_ACTIVE_LOW, IPT_UNUSED)
-
-	PORT_START("JOYSTICKS")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT)
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT)
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_PLAYER(2)
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN) PORT_PLAYER(2)
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_PLAYER(2)
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(2)
-
-	PORT_START("BUTTONS")
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_BUTTON1)
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(2)
-INPUT_PORTS_END
-
-
-static INPUT_PORTS_START( svi328 )
-
-	PORT_INCLUDE( svi318 )
-
-	PORT_MODIFY("LINE.9")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0_PAD)           PORT_CHAR(UCHAR_MAMEKEY(0_PAD))
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD)           PORT_CHAR(UCHAR_MAMEKEY(1_PAD))
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD)           PORT_CHAR(UCHAR_MAMEKEY(2_PAD))
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD)           PORT_CHAR(UCHAR_MAMEKEY(3_PAD))
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD)           PORT_CHAR(UCHAR_MAMEKEY(4_PAD))
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD)           PORT_CHAR(UCHAR_MAMEKEY(5_PAD))
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD)           PORT_CHAR(UCHAR_MAMEKEY(6_PAD))
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD)           PORT_CHAR(UCHAR_MAMEKEY(7_PAD))
-
-	PORT_MODIFY("LINE.10")
-	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD)           PORT_CHAR(UCHAR_MAMEKEY(8_PAD))
-	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD)           PORT_CHAR(UCHAR_MAMEKEY(9_PAD))
-	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD)        PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))
-	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD)       PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD))
-	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK)        PORT_CHAR(UCHAR_MAMEKEY(ASTERISK))
-	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD)       PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD))
-	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER_PAD)       PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))
-	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Keypad ,") PORT_CODE(KEYCODE_DEL_PAD)
-INPUT_PORTS_END
-
-WRITE_LINE_MEMBER(svi318_state::vdp_interrupt)
-{
-	m_maincpu->set_input_line(0, (state ? HOLD_LINE : CLEAR_LINE));
-}
-
-FLOPPY_FORMATS_MEMBER( svi318_state::floppy_formats )
-	FLOPPY_SVI_FORMAT
-FLOPPY_FORMATS_END
-
-static SLOT_INTERFACE_START( svi_floppies )
-	SLOT_INTERFACE("dd", FLOPPY_525_DD)
-SLOT_INTERFACE_END
-
-static MACHINE_CONFIG_FRAGMENT( svi318_cartslot )
-	MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "svi318_cart")
-	MCFG_GENERIC_EXTENSIONS("bin,rom")
-	//MCFG_GENERIC_LOAD(svi318_state, svi318_cart)
-
-	/* Software lists */
-	MCFG_SOFTWARE_LIST_ADD("cart_list","svi318_cart")
-MACHINE_CONFIG_END
-
-static MACHINE_CONFIG_START( svi318, svi318_state )
-	/* Basic machine hardware */
-	MCFG_CPU_ADD("maincpu", Z80, 3579545) /* 3.579545 MHz */
-	MCFG_CPU_PROGRAM_MAP(svi318_mem)
-	MCFG_CPU_IO_MAP(svi318_io)
-	MCFG_QUANTUM_TIME(attotime::from_hz(60))
-
-	MCFG_DEVICE_ADD("ppi8255", I8255, 0)
-	//MCFG_I8255_IN_PORTA_CB(READ8(svi318_state, ppi_port_a_r))
-	//MCFG_I8255_IN_PORTB_CB(READ8(svi318_state, ppi_port_b_r))
-	//MCFG_I8255_OUT_PORTC_CB(WRITE8(svi318_state, ppi_port_c_w))
-
-	MCFG_DEVICE_ADD("ins8250_0", INS8250, 1000000)
-	//MCFG_INS8250_OUT_INT_CB(WRITELINE(svi318_state, ins8250_interrupt))
-	MCFG_DEVICE_ADD("ins8250_1", INS8250, 3072000)
-	//MCFG_INS8250_OUT_INT_CB(WRITELINE(svi318_state, ins8250_interrupt))
-
-	/* Video hardware */
-	//MCFG_DEVICE_ADD("tms9928a", TMS9929A, XTAL_10_738635MHz / 2)
-	//MCFG_TMS9928A_VRAM_SIZE(0x4000)
-	//MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(svi318_state, vdp_interrupt))
-	//MCFG_TMS9928A_SCREEN_ADD_PAL("screen")
-	//MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9929a_device, screen_update)
-
-	/* Sound hardware */
-	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD("dac", DAC, 0)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-	MCFG_SOUND_ADD("ay8910", AY8910, 1789773)
-	//MCFG_AY8910_PORT_A_READ_CB(READ8(svi318_state, psg_port_a_r))
-	//MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(svi318_state, psg_port_b_w))
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
-
-	/* printer */
-	MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
-	//MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(svi318_state, write_centronics_busy))
-
-	MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
-
-	MCFG_CASSETTE_ADD("cassette")
-	MCFG_CASSETTE_FORMATS(svi_cassette_formats)
-	MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY)
-	MCFG_CASSETTE_INTERFACE("svi318_cass")
-
-	MCFG_SOFTWARE_LIST_ADD("cass_list", "svi318_cass")
-
-	MCFG_FD1793_ADD("wd179x", XTAL_1MHz)
-	//MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(svi318_state, fdc_intrq_w))
-	//MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(svi318_state, fdc_drq_w))
-
-	MCFG_FLOPPY_DRIVE_ADD("wd179x:0", svi_floppies, "dd", svi318_state::floppy_formats)
-	MCFG_FLOPPY_DRIVE_ADD("wd179x:1", svi_floppies, "dd", svi318_state::floppy_formats)
-
-	MCFG_SOFTWARE_LIST_ADD("disk_list", "svi318_flop")
-
-	MCFG_FRAGMENT_ADD(svi318_cartslot)
-
-	/* internal ram */
-	MCFG_RAM_ADD(RAM_TAG)
-	MCFG_RAM_DEFAULT_SIZE("16K")
-	MCFG_RAM_EXTRA_OPTIONS("32K,96K,160K")
-MACHINE_CONFIG_END
-
-static MACHINE_CONFIG_DERIVED( svi318n, svi318 )
-
-	//MCFG_DEVICE_REMOVE("tms9928a")
-	//MCFG_DEVICE_REMOVE("screen")
-	//MCFG_DEVICE_ADD("tms9928a", TMS9928A, XTAL_10_738635MHz / 2)
-	//MCFG_TMS9928A_VRAM_SIZE(0x4000)
-	//MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(svi318_state, vdp_interrupt))
-	//MCFG_TMS9928A_SCREEN_ADD_NTSC("screen")
-	//MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
-MACHINE_CONFIG_END
-
-static MACHINE_CONFIG_DERIVED( svi328, svi318 )
-
-	/* internal ram */
-	MCFG_RAM_MODIFY(RAM_TAG)
-	MCFG_RAM_DEFAULT_SIZE("64K")
-	MCFG_RAM_EXTRA_OPTIONS("96K,160K")
-MACHINE_CONFIG_END
-
-static MACHINE_CONFIG_DERIVED( svi328n, svi318n )
-
-	/* internal ram */
-	MCFG_RAM_MODIFY(RAM_TAG)
-	MCFG_RAM_DEFAULT_SIZE("64K")
-	MCFG_RAM_EXTRA_OPTIONS("96K,160K")
-MACHINE_CONFIG_END
-
-
-/* F4 Character Displayer */
-static const gfx_layout svi328_charlayout =
-{
-	8, 8,                   /* 8 x 16 characters */
-	256,                    /* 128 characters */
-	1,                  /* 1 bits per pixel */
-	{ 0 },                  /* no bitplanes */
-	/* x offsets */
-	{ 0, 1, 2, 3, 4, 5, 6, 7 },
-	/* y offsets */
-	{  0*8,  1*8,  2*8,  3*8,  4*8,  5*8,  6*8,  7*8, 8*8,  9*8, 10*8, 11*8, 12*8, 13*8, 14*8, 15*8 },
-	8*16                    /* every char takes 16 bytes */
-};
-
-static GFXDECODE_START( svi328 )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, svi328_charlayout, 0, 9 )
-GFXDECODE_END
-
-static MACHINE_CONFIG_START( svi328_806, svi318_state )
-	/* Basic machine hardware */
-	MCFG_CPU_ADD("maincpu", Z80, 3579545) /* 3.579545 MHz */
-	MCFG_CPU_PROGRAM_MAP(svi328_806_mem)
-	MCFG_CPU_IO_MAP(svi328_806_io)
-	MCFG_QUANTUM_TIME(attotime::from_hz(60))
-
-	MCFG_DEVICE_ADD("ppi8255", I8255, 0)
-	//MCFG_I8255_IN_PORTA_CB(READ8(svi318_state, ppi_port_a_r))
-	//MCFG_I8255_IN_PORTB_CB(READ8(svi318_state, ppi_port_b_r))
-	//MCFG_I8255_OUT_PORTC_CB(WRITE8(svi318_state, ppi_port_c_w))
-
-	MCFG_DEVICE_ADD("ins8250_0", INS8250, 1000000)
-	//MCFG_INS8250_OUT_INT_CB(WRITELINE(svi318_state, ins8250_interrupt))
-	MCFG_DEVICE_ADD("ins8250_1", INS8250, 3072000)
-	//MCFG_INS8250_OUT_INT_CB(WRITELINE(svi318_state, ins8250_interrupt))
-
-	/* Video hardware */
-	MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
-
-	//MCFG_DEVICE_ADD("tms9928a", TMS9929A, XTAL_10_738635MHz / 2)
-	//MCFG_TMS9928A_VRAM_SIZE(0x4000)
-	//MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(svi318_state, vdp_interrupt))
-	//MCFG_TMS9928A_SET_SCREEN("screen")
-	//MCFG_TMS9928A_SCREEN_ADD_PAL("screen")
-	//MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9929a_device, screen_update)
-	MCFG_PALETTE_ADD("palette", TMS9928A_PALETTE_SIZE + 2)  /* 2 additional entries for monochrome svi806 output */
-
-	//MCFG_SCREEN_ADD("svi806", RASTER)
-	//MCFG_SCREEN_REFRESH_RATE(50)
-	//MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
-	//MCFG_SCREEN_SIZE(640, 400)
-	//MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1)
-	//MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
-
-	MCFG_GFXDECODE_ADD("gfxdecode", "palette", svi328)
-
-	//MCFG_MC6845_ADD("crtc", MC6845, "svi806", XTAL_12MHz / 8)
-	//MCFG_MC6845_SHOW_BORDER_AREA(false)
-	//MCFG_MC6845_CHAR_WIDTH(8)   /* ? */
-	//MCFG_MC6845_UPDATE_ROW_CB(svi318_state, crtc_update_row)
-
-	/* Sound hardware */
-	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD("dac", DAC, 0)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-	MCFG_SOUND_ADD("ay8910", AY8910, 1789773)
-	//MCFG_AY8910_PORT_A_READ_CB(READ8(svi318_state, psg_port_a_r))
-	//MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(svi318_state, psg_port_b_w))
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
-
-	/* printer */
-	MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
-	//MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(svi318_state, write_centronics_busy))
-
-	MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
-
-	MCFG_CASSETTE_ADD("cassette")
-	MCFG_CASSETTE_FORMATS(svi_cassette_formats)
-	MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY)
-	MCFG_CASSETTE_INTERFACE("svi318_cass")
-
-	MCFG_SOFTWARE_LIST_ADD("cass_list", "svi318_cass")
-
-	MCFG_FD1793_ADD("wd179x", XTAL_1MHz)
-	//MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(svi318_state, fdc_intrq_w))
-	//MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(svi318_state, fdc_drq_w))
-
-	MCFG_FLOPPY_DRIVE_ADD("wd179x:0", svi_floppies, "dd", svi318_state::floppy_formats)
-	MCFG_FLOPPY_DRIVE_ADD("wd179x:1", svi_floppies, "dd", svi318_state::floppy_formats)
-
-	MCFG_SOFTWARE_LIST_ADD("disk_list", "svi318_flop")
-
-	MCFG_FRAGMENT_ADD(svi318_cartslot)
-
-	/* internal ram */
-	MCFG_RAM_ADD(RAM_TAG)
-	MCFG_RAM_DEFAULT_SIZE("64K")
-	MCFG_RAM_EXTRA_OPTIONS("96K,160K")
-MACHINE_CONFIG_END
-
-static MACHINE_CONFIG_DERIVED( svi328n_806, svi328_806 )
-
-	//MCFG_SCREEN_MODIFY("screen")
-	//MCFG_SCREEN_REFRESH_RATE(60)
-MACHINE_CONFIG_END
-
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+// thanks-to: Tomas Karlsson, Sean Young
 /***************************************************************************
 
-  Game driver(s)
+    Spectravideo SVI-318/328
+
+    TODO:
+    - Expansion port (and all attached peripherals)
 
 ***************************************************************************/
 
+#include "emu.h"
+#include "cpu/z80/z80.h"
+#include "machine/ram.h"
+#include "machine/i8255.h"
+#include "video/tms9928a.h"
+#include "sound/ay8910.h"
+#include "sound/speaker.h"
+#include "sound/wave.h"
+#include "imagedev/cassette.h"
+#include "formats/svi_cas.h"
+#include "bus/generic/slot.h"
+#include "bus/generic/carts.h"
+#include "softlist.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class svi3x8_state : public driver_device
+{
+public:
+	svi3x8_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG),
+		m_basic(*this, "basic"),
+		m_speaker(*this, "speaker"),
+		m_cassette(*this, "cassette"),
+		m_cart(*this, "cartslot"),
+		m_keyboard(*this, "KEY"),
+		m_buttons(*this, "BUTTONS"),
+		m_keyboard_row(0)
+	{}
+
+	DECLARE_READ8_MEMBER( ppi_port_a_r );
+	DECLARE_READ8_MEMBER( ppi_port_b_r );
+	DECLARE_WRITE8_MEMBER( ppi_port_c_w );
+	DECLARE_WRITE8_MEMBER( psg_port_b_w );
+	DECLARE_WRITE_LINE_MEMBER( intvdp_w );
+
+	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cartridge);
+
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+private:
+	void reset_memory_configuration();
+
+	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
+	required_memory_region m_basic;
+	required_device<speaker_sound_device> m_speaker;
+	required_device<cassette_image_device> m_cassette;
+	required_device<generic_slot_device> m_cart;
+	required_ioport_array<16> m_keyboard;
+	required_ioport m_buttons;
+
+	UINT8 m_keyboard_row;
+};
+
+
+//**************************************************************************
+//  ADDRESS MAPS
+//**************************************************************************
+
+static ADDRESS_MAP_START( svi3x8_mem, AS_PROGRAM, 8, svi3x8_state )
+	ADDRESS_MAP_UNMAP_HIGH
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START( svi3x8_io, AS_IO, 8, svi3x8_state )
+	ADDRESS_MAP_GLOBAL_MASK(0xff)
+	AM_RANGE(0x80, 0x80) AM_MIRROR(0x22) AM_DEVWRITE("vdp", tms9928a_device, vram_write)
+	AM_RANGE(0x81, 0x81) AM_MIRROR(0x22) AM_DEVWRITE("vdp", tms9928a_device, register_write)
+	AM_RANGE(0x84, 0x84) AM_MIRROR(0x22) AM_DEVREAD("vdp", tms9928a_device, vram_read)
+	AM_RANGE(0x85, 0x85) AM_MIRROR(0x22) AM_DEVREAD("vdp", tms9928a_device, register_read)
+	AM_RANGE(0x88, 0x88) AM_MIRROR(0x23) AM_DEVWRITE("psg", ay8910_device, address_w)
+	AM_RANGE(0x8c, 0x8c) AM_MIRROR(0x23) AM_DEVWRITE("psg", ay8910_device, data_w)
+	AM_RANGE(0x90, 0x90) AM_MIRROR(0x23) AM_DEVREAD("psg", ay8910_device, data_r)
+	AM_RANGE(0x94, 0x97) AM_DEVWRITE("ppi", i8255_device, write)
+	AM_RANGE(0x98, 0x9a) AM_DEVREAD("ppi", i8255_device, read)
+ADDRESS_MAP_END
+
+
+//**************************************************************************
+//  INPUTS
+//**************************************************************************
+
+static INPUT_PORTS_START( svi318 )
+	PORT_START("KEY.0")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)           PORT_CHAR('0') PORT_CHAR(')')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)           PORT_CHAR('1') PORT_CHAR('!')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)           PORT_CHAR('2') PORT_CHAR('@')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)           PORT_CHAR('3') PORT_CHAR('#')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)           PORT_CHAR('4') PORT_CHAR('$')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)           PORT_CHAR('5') PORT_CHAR('%')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)           PORT_CHAR('6') PORT_CHAR('^')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)           PORT_CHAR('7') PORT_CHAR('&')
+
+	PORT_START("KEY.1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)           PORT_CHAR('8') PORT_CHAR('*')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)           PORT_CHAR('9') PORT_CHAR('(')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)       PORT_CHAR(':') PORT_CHAR(';')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)       PORT_CHAR('\'') PORT_CHAR('"')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)       PORT_CHAR(',') PORT_CHAR('<')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)      PORT_CHAR('=') PORT_CHAR('+')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)        PORT_CHAR('.') PORT_CHAR('>')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)       PORT_CHAR('/') PORT_CHAR('?')
+
+	PORT_START("KEY.2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)       PORT_CHAR('-') PORT_CHAR('_')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)           PORT_CHAR('a') PORT_CHAR('A')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)           PORT_CHAR('b') PORT_CHAR('B')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)           PORT_CHAR('c') PORT_CHAR('C')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)           PORT_CHAR('d') PORT_CHAR('D')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)           PORT_CHAR('e') PORT_CHAR('E')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)           PORT_CHAR('f') PORT_CHAR('F')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)           PORT_CHAR('g') PORT_CHAR('G')
+
+	PORT_START("KEY.3")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)           PORT_CHAR('h') PORT_CHAR('H')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)           PORT_CHAR('i') PORT_CHAR('I')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)           PORT_CHAR('0') PORT_CHAR('J')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)           PORT_CHAR('k') PORT_CHAR('K')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)           PORT_CHAR('l') PORT_CHAR('L')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)           PORT_CHAR('m') PORT_CHAR('M')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)           PORT_CHAR('n') PORT_CHAR('N')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)           PORT_CHAR('o') PORT_CHAR('O')
+
+	PORT_START("KEY.4")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)           PORT_CHAR('p') PORT_CHAR('P')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)           PORT_CHAR('q') PORT_CHAR('Q')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)           PORT_CHAR('r') PORT_CHAR('R')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)           PORT_CHAR('s') PORT_CHAR('S')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)           PORT_CHAR('t') PORT_CHAR('T')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)           PORT_CHAR('u') PORT_CHAR('U')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)           PORT_CHAR('v') PORT_CHAR('V')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)           PORT_CHAR('w') PORT_CHAR('W')
+
+	PORT_START("KEY.5")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)           PORT_CHAR('x') PORT_CHAR('X')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)           PORT_CHAR('y') PORT_CHAR('Y')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)           PORT_CHAR('z') PORT_CHAR('Z')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)   PORT_CHAR('[') PORT_CHAR('{')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)   PORT_CHAR('\\') PORT_CHAR('~')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE)  PORT_CHAR(']') PORT_CHAR('}')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE)   PORT_CHAR(8)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP)          PORT_CHAR(UCHAR_MAMEKEY(UP))   PORT_NAME(UTF8_UP)
+
+	PORT_START("KEY.6")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT)      PORT_CODE(KEYCODE_RSHIFT)      PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL)    PORT_CHAR(UCHAR_SHIFT_2)       PORT_NAME("Ctrl")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LALT)        PORT_CHAR(UCHAR_MAMEKEY(PGUP)) PORT_NAME("Left Grph")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RALT)        PORT_CHAR(UCHAR_MAMEKEY(PGDN)) PORT_NAME("Right Grph")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC)         PORT_CHAR(UCHAR_MAMEKEY(ESC))
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_END)         PORT_CHAR(UCHAR_MAMEKEY(END))  PORT_NAME("Stop")
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER)       PORT_CHAR(13)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT)        PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_NAME(UTF8_LEFT)
+
+	PORT_START("KEY.7")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F1)          PORT_CHAR(UCHAR_MAMEKEY(F1))     PORT_CHAR(UCHAR_MAMEKEY(F6))
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F2)          PORT_CHAR(UCHAR_MAMEKEY(F2))     PORT_CHAR(UCHAR_MAMEKEY(F7))
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F3)          PORT_CHAR(UCHAR_MAMEKEY(F3))     PORT_CHAR(UCHAR_MAMEKEY(F8))
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F4)          PORT_CHAR(UCHAR_MAMEKEY(F4))     PORT_CHAR(UCHAR_MAMEKEY(F9))
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F5)          PORT_CHAR(UCHAR_MAMEKEY(F5))     PORT_CHAR(UCHAR_MAMEKEY(F10))
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME)        PORT_CHAR(UCHAR_MAMEKEY(HOME))   PORT_NAME("CLS/HM  Copy")
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_INSERT)      PORT_CHAR(UCHAR_MAMEKEY(INSERT)) PORT_NAME("Ins  Paste")
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN)        PORT_CHAR(UCHAR_MAMEKEY(DOWN))   PORT_NAME(UTF8_DOWN)
+
+	PORT_START("KEY.8")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)       PORT_CHAR(' ')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB)         PORT_CHAR('\t')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL)         PORT_CHAR(UCHAR_MAMEKEY(DEL))      PORT_NAME("Del  Cut")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK)    PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_NAME("Caps Lock")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_PAUSE)       PORT_CHAR(UCHAR_MAMEKEY(F11))      PORT_NAME("Select")
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_PRTSCR)      PORT_CHAR(UCHAR_MAMEKEY(PRTSCR))   PORT_NAME("Print")
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT)       PORT_CHAR(UCHAR_MAMEKEY(RIGHT))    PORT_NAME(UTF8_RIGHT)
+
+	PORT_START("KEY.9")
+	PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("KEY.10")
+	PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("KEY.11")
+	PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("KEY.12")
+	PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("KEY.13")
+	PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("KEY.14")
+	PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("KEY.15")
+	PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("JOY")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)    PORT_PLAYER(1)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)  PORT_PLAYER(1)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT)  PORT_PLAYER(1)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(1)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)    PORT_PLAYER(2)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)  PORT_PLAYER(2)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT)  PORT_PLAYER(2)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(2)
+
+	PORT_START("BUTTONS")
+	PORT_BIT(0x0f, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(1)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(2)
+	PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( svi328 )
+	PORT_INCLUDE(svi318)
+
+	PORT_MODIFY("KEY.9")
+	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0_PAD)      PORT_CHAR(UCHAR_MAMEKEY(0_PAD))
+	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD)      PORT_CHAR(UCHAR_MAMEKEY(1_PAD))
+	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD)      PORT_CHAR(UCHAR_MAMEKEY(2_PAD))
+	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD)      PORT_CHAR(UCHAR_MAMEKEY(3_PAD))
+	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD)      PORT_CHAR(UCHAR_MAMEKEY(4_PAD))
+	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD)      PORT_CHAR(UCHAR_MAMEKEY(5_PAD))
+	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD)      PORT_CHAR(UCHAR_MAMEKEY(6_PAD))
+	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD)      PORT_CHAR(UCHAR_MAMEKEY(7_PAD))
+
+	PORT_MODIFY("KEY.10")
+	PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD)      PORT_CHAR(UCHAR_MAMEKEY(8_PAD))
+	PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD)      PORT_CHAR(UCHAR_MAMEKEY(9_PAD))
+	PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD)   PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))
+	PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD)  PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD))
+	PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK)   PORT_CHAR(UCHAR_MAMEKEY(ASTERISK))
+	PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD)  PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD))
+	PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER_PAD)  PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))
+	PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL_PAD)    PORT_NAME("Keypad ,")
+INPUT_PORTS_END
+
+
+//**************************************************************************
+//  VIDEO EMULATION
+//**************************************************************************
+
+WRITE_LINE_MEMBER( svi3x8_state::intvdp_w )
+{
+	// note: schematics show a CNTRL line that allows switching between
+	// IRQ and NMI for the interrupt
+	m_maincpu->set_input_line(INPUT_LINE_IRQ0, state);
+}
+
+
+//**************************************************************************
+//  MACHINE EMULATION
+//**************************************************************************
+
+void svi3x8_state::reset_memory_configuration()
+{
+	m_maincpu->space(AS_PROGRAM).install_rom(0x0000, 0x7fff, m_basic->base());
+
+	if (m_ram->size() == 64 * 1024)
+	{
+		// SVI-328
+		m_maincpu->space(AS_PROGRAM).install_ram(0x8000, 0xffff, m_ram->pointer());
+	}
+	else
+	{
+		// SVI-318
+		m_maincpu->space(AS_PROGRAM).unmap_readwrite(0x8000, 0xbfff);
+		m_maincpu->space(AS_PROGRAM).install_ram(0xc000, 0xffff, m_ram->pointer());
+	}
+}
+
+void svi3x8_state::machine_start()
+{
+	// register for save states
+	save_item(NAME(m_keyboard_row));
+}
+
+void svi3x8_state::machine_reset()
+{
+	reset_memory_configuration();
+}
+
+WRITE8_MEMBER( svi3x8_state::psg_port_b_w )
+{
+	reset_memory_configuration();
+
+	// CART
+	if (BIT(data, 0) == 0)
+	{
+		if (m_cart->exists())
+			m_maincpu->space(AS_PROGRAM).install_rom(0x0000, 0x7fff, m_cart->get_rom_base());
+		else
+			m_maincpu->space(AS_PROGRAM).unmap_readwrite(0x0000, 0x7fff);
+	}
+	else
+	{
+		// BK21 (SV-328)
+		if (BIT(data, 1) == 0)
+		{
+			if (m_ram->size() == 64 * 1024)
+				m_maincpu->space(AS_PROGRAM).install_ram(0x0000, 0x7fff, m_ram->pointer() + 0x8000);
+			else
+				m_maincpu->space(AS_PROGRAM).unmap_readwrite(0x0000, 0x7fff);
+		}
+
+		// BK22 (SV-807)
+		if (BIT(data, 2) == 0)
+			m_maincpu->space(AS_PROGRAM).unmap_readwrite(0x8000, 0xffff);
+
+		// BK31 (SV-807)
+		if (BIT(data, 3) == 0)
+			m_maincpu->space(AS_PROGRAM).unmap_readwrite(0x0000, 0x7fff);
+
+		// BK32 (SV-807)
+		if (BIT(data, 4) == 0)
+			m_maincpu->space(AS_PROGRAM).unmap_readwrite(0x8000, 0xffff);
+	}
+
+	output().set_value("led_caps_lock", BIT(data, 5));
+}
+
+READ8_MEMBER( svi3x8_state::ppi_port_a_r )
+{
+	UINT8 data = 0x3f;
+
+	// bit 0-3, paddle or tablet input
+
+	// bit 4-5, joystick buttons
+	data &= m_buttons->read();
+
+	// bit 6-7, cassette
+	data |= m_cassette->exists() ? 0x00 : 0x40;
+	data |= (m_cassette->input() > 0.0038) ? 0x80 : 0x00;
+
+	return data;
+}
+
+READ8_MEMBER( svi3x8_state::ppi_port_b_r )
+{
+	// bit 0-7, keyboard data
+	return m_keyboard[m_keyboard_row]->read();
+}
+
+WRITE8_MEMBER( svi3x8_state::ppi_port_c_w )
+{
+	// bit 0-3, keyboard row
+	m_keyboard_row = data & 0x0f;
+
+	// bit 4-6, cassette
+	m_cassette->change_state(BIT(data, 4) ? CASSETTE_MOTOR_DISABLED : CASSETTE_MOTOR_ENABLED, CASSETTE_MASK_MOTOR);
+	m_cassette->output(BIT(data, 5) ? -1.0 : +1.0);
+	m_cassette->change_state(BIT(data, 6) ? CASSETTE_SPEAKER_ENABLED : CASSETTE_SPEAKER_MUTED, CASSETTE_MASK_SPEAKER);
+
+	// bit 7, mix psg sound (keyboard click)
+	m_speaker->level_w(BIT(data, 7));
+}
+
+
+//**************************************************************************
+//  CARTRIDGE
+//**************************************************************************
+
+DEVICE_IMAGE_LOAD_MEMBER( svi3x8_state, cartridge )
+{
+	UINT32 size = m_cart->common_get_size("rom");
+
+	if (size != 0x8000)
+	{
+		popmessage("Cartridge image '%s' invalid size: %u bytes", image.filename(), size);
+		return IMAGE_INIT_FAIL;
+	}
+
+	m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
+	m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
+	return IMAGE_INIT_PASS;
+}
+
+
+//**************************************************************************
+//  MACHINE DEFINTIONS
+//**************************************************************************
+
+static MACHINE_CONFIG_START( svi318, svi3x8_state )
+	// basic machine hardware
+	MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz / 3)
+	MCFG_CPU_PROGRAM_MAP(svi3x8_mem)
+	MCFG_CPU_IO_MAP(svi3x8_io)
+
+	MCFG_RAM_ADD(RAM_TAG)
+	MCFG_RAM_DEFAULT_SIZE("16K")
+
+	MCFG_DEVICE_ADD("ppi", I8255, 0)
+	MCFG_I8255_IN_PORTA_CB(READ8(svi3x8_state, ppi_port_a_r))
+	MCFG_I8255_IN_PORTB_CB(READ8(svi3x8_state, ppi_port_b_r))
+	MCFG_I8255_OUT_PORTC_CB(WRITE8(svi3x8_state, ppi_port_c_w))
+
+	// video hardware
+	MCFG_DEVICE_ADD("vdp", TMS9929A, XTAL_10_738635MHz / 2)
+	MCFG_TMS9928A_VRAM_SIZE(0x4000)
+	MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(svi3x8_state, intvdp_w))
+	MCFG_TMS9928A_SCREEN_ADD_PAL("screen")
+	MCFG_SCREEN_UPDATE_DEVICE("vdp", tms9929a_device, screen_update)
+
+	// sound hardware
+	MCFG_SPEAKER_STANDARD_MONO("mono")
+	MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+	MCFG_SOUND_ADD("psg", AY8910, XTAL_10_738635MHz / 6)
+	MCFG_AY8910_PORT_A_READ_CB(IOPORT("JOY"))
+	MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(svi3x8_state, psg_port_b_w))
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+
+	// cassette
+	MCFG_CASSETTE_ADD("cassette")
+	MCFG_CASSETTE_FORMATS(svi_cassette_formats)
+	MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
+	MCFG_CASSETTE_INTERFACE("svi318_cass")
+	MCFG_SOFTWARE_LIST_ADD("cass_list", "svi318_cass")
+
+	// cartridge slot
+	MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "svi318_cart")
+	MCFG_GENERIC_EXTENSIONS("bin,rom")
+	MCFG_GENERIC_LOAD(svi3x8_state, cartridge)
+	MCFG_SOFTWARE_LIST_ADD("cart_list", "svi318_cart")
+MACHINE_CONFIG_END
+
+static MACHINE_CONFIG_DERIVED( svi318n, svi318 )
+	MCFG_DEVICE_REMOVE("vdp")
+	MCFG_DEVICE_REMOVE("screen")
+	MCFG_DEVICE_ADD("vdp", TMS9928A, XTAL_10_738635MHz / 2)
+	MCFG_TMS9928A_VRAM_SIZE(0x4000)
+	MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(svi3x8_state, intvdp_w))
+	MCFG_TMS9928A_SCREEN_ADD_NTSC("screen")
+	MCFG_SCREEN_UPDATE_DEVICE("vdp", tms9928a_device, screen_update)
+MACHINE_CONFIG_END
+
+static MACHINE_CONFIG_DERIVED( svi328, svi318 )
+	MCFG_DEVICE_REMOVE(RAM_TAG)
+	MCFG_RAM_ADD(RAM_TAG)
+	MCFG_RAM_DEFAULT_SIZE("64K")
+MACHINE_CONFIG_END
+
+static MACHINE_CONFIG_DERIVED( svi328n, svi318n )
+	MCFG_DEVICE_REMOVE(RAM_TAG)
+	MCFG_RAM_ADD(RAM_TAG)
+	MCFG_RAM_DEFAULT_SIZE("64K")
+MACHINE_CONFIG_END
+
+
+//**************************************************************************
+//  ROM DEFINITIONS
+//**************************************************************************
+
+// note: should be split into two 16k chips, document differenes
 ROM_START( svi318 )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_SYSTEM_BIOS(0, "111", "SV BASIC v1.11")
+	ROM_REGION(0x8000, "basic", 0)
+	ROM_SYSTEM_BIOS(0, "v111", "SV BASIC v1.11")
 	ROMX_LOAD("svi111.rom", 0x0000, 0x8000, CRC(bc433df6) SHA1(10349ce675f6d6d47f0976e39cb7188eba858d89), ROM_BIOS(1))
-	ROM_SYSTEM_BIOS(1, "110", "SV BASIC v1.1")
+	ROM_SYSTEM_BIOS(1, "v11", "SV BASIC v1.1")
 	ROMX_LOAD("svi110.rom", 0x0000, 0x8000, CRC(709904e9) SHA1(7d8daf52f78371ca2c9443e04827c8e1f98c8f2c), ROM_BIOS(2))
-	ROM_SYSTEM_BIOS(2, "100", "SV BASIC v1.0")
+	ROM_SYSTEM_BIOS(2, "v10", "SV BASIC v1.0")
 	ROMX_LOAD("svi100.rom", 0x0000, 0x8000, CRC(98d48655) SHA1(07758272df475e5e06187aa3574241df1b14035b), ROM_BIOS(3))
 ROM_END
 
-ROM_START( svi318n  )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_SYSTEM_BIOS(0, "111", "SV BASIC v1.11")
-	ROMX_LOAD("svi111.rom", 0x0000, 0x8000, CRC(bc433df6) SHA1(10349ce675f6d6d47f0976e39cb7188eba858d89), ROM_BIOS(1))
-	ROM_SYSTEM_BIOS(1, "110", "SV BASIC v1.1")
-	ROMX_LOAD("svi110.rom", 0x0000, 0x8000, CRC(709904e9) SHA1(7d8daf52f78371ca2c9443e04827c8e1f98c8f2c), ROM_BIOS(2))
-	ROM_SYSTEM_BIOS(2, "100", "SV BASIC v1.0")
-	ROMX_LOAD("svi100.rom", 0x0000, 0x8000, CRC(98d48655) SHA1(07758272df475e5e06187aa3574241df1b14035b), ROM_BIOS(3))
-ROM_END
-
-ROM_START( svi328 )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_SYSTEM_BIOS(0, "111", "SV BASIC v1.11")
-	ROMX_LOAD("svi111.rom", 0x0000, 0x8000, CRC(bc433df6) SHA1(10349ce675f6d6d47f0976e39cb7188eba858d89), ROM_BIOS(1))
-	ROM_SYSTEM_BIOS(1, "110", "SV BASIC v1.1")
-	ROMX_LOAD("svi110.rom", 0x0000, 0x8000, CRC(709904e9) SHA1(7d8daf52f78371ca2c9443e04827c8e1f98c8f2c), ROM_BIOS(2))
-	ROM_SYSTEM_BIOS(2, "100", "SV BASIC v1.0")
-	ROMX_LOAD("svi100.rom", 0x0000, 0x8000, CRC(98d48655) SHA1(07758272df475e5e06187aa3574241df1b14035b), ROM_BIOS(3))
-ROM_END
-
-ROM_START( svi328n )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_SYSTEM_BIOS(0, "111", "SV BASIC v1.11")
-	ROMX_LOAD("svi111.rom", 0x0000, 0x8000, CRC(bc433df6) SHA1(10349ce675f6d6d47f0976e39cb7188eba858d89), ROM_BIOS(1))
-	ROM_SYSTEM_BIOS(1, "110", "SV BASIC v1.1")
-	ROMX_LOAD("svi110.rom", 0x0000, 0x8000, CRC(709904e9) SHA1(7d8daf52f78371ca2c9443e04827c8e1f98c8f2c), ROM_BIOS(2))
-	ROM_SYSTEM_BIOS(2, "100", "SV BASIC v1.0")
-	ROMX_LOAD("svi100.rom", 0x0000, 0x8000, CRC(98d48655) SHA1(07758272df475e5e06187aa3574241df1b14035b), ROM_BIOS(3))
-ROM_END
-
-ROM_START( sv328p80 )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD("svi111.rom", 0x0000, 0x8000, CRC(bc433df6) SHA1(10349ce675f6d6d47f0976e39cb7188eba858d89))
-
-	ROM_REGION( 0x1000, "gfx1", 0 )
-	ROM_SYSTEM_BIOS(0, "english", "English Character Set")
-	ROMX_LOAD("svi806.rom",   0x0000, 0x1000, CRC(850bc232) SHA1(ed45cb0e9bd18a9d7bd74f87e620f016a7ae840f), ROM_BIOS(1))
-	ROM_SYSTEM_BIOS(1, "swedish", "Swedish Character Set")
-	ROMX_LOAD("svi806se.rom", 0x0000, 0x1000, CRC(daea8956) SHA1(3f16d5513ad35692488ae7d864f660e76c6e8ed3), ROM_BIOS(2))
-ROM_END
-
-ROM_START( sv328n80 )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD("svi111.rom", 0x0000, 0x8000, CRC(bc433df6) SHA1(10349ce675f6d6d47f0976e39cb7188eba858d89))
-
-	ROM_REGION( 0x1000, "gfx1", 0 )
-	ROM_SYSTEM_BIOS(0, "english", "English Character Set")
-	ROMX_LOAD("svi806.rom",   0x0000, 0x1000, CRC(850bc232) SHA1(ed45cb0e9bd18a9d7bd74f87e620f016a7ae840f), ROM_BIOS(1))
-	ROM_SYSTEM_BIOS(1, "swedish", "Swedish Character Set")
-	ROMX_LOAD("svi806se.rom", 0x0000, 0x1000, CRC(daea8956) SHA1(3f16d5513ad35692488ae7d864f660e76c6e8ed3), ROM_BIOS(2))
-ROM_END
+#define rom_svi318n rom_svi318
+#define rom_svi328  rom_svi318
+#define rom_svi328n rom_svi318
 
 
-/*    YEAR  NAME        PARENT  COMPAT  MACHINE        INPUT   INIT                       COMPANY         FULLNAME                    FLAGS */
-COMP( 1983, svi318,     0,      0,      svi318,        svi318, driver_device, 0,      "Spectravideo", "SVI-318 (PAL)",   MACHINE_NOT_WORKING )
-COMP( 1983, svi318n,    svi318, 0,      svi318n,       svi318, driver_device, 0,      "Spectravideo", "SVI-318 (NTSC)",  MACHINE_NOT_WORKING )
-COMP( 1983, svi328,     svi318, 0,      svi328,        svi328, driver_device, 0,      "Spectravideo", "SVI-328 (PAL)",   MACHINE_NOT_WORKING )
-COMP( 1983, svi328n,    svi318, 0,      svi328n,       svi328, driver_device, 0,      "Spectravideo", "SVI-328 (NTSC)",  MACHINE_NOT_WORKING )
-COMP( 1983, sv328p80,   svi318, 0,      svi328_806,    svi328, driver_device, 0,  	  "Spectravideo", "SVI-328 (PAL) + SVI-806 80 column card",  MACHINE_NOT_WORKING )
-COMP( 1983, sv328n80,   svi318, 0,      svi328n_806,   svi328, driver_device, 0,      "Spectravideo", "SVI-328 (NTSC) + SVI-806 80 column card", MACHINE_NOT_WORKING )
+//**************************************************************************
+//  SYSTEM DRIVERS
+//**************************************************************************
+
+//    YEAR  NAME     PARENT    COMPAT  MACHINE  INPUT   CLASS         INIT  COMPANY         FULLNAME   FLAGS
+COMP( 1983, svi318,  0,        0,      svi318,  svi318, driver_device, 0,    "Spectravideo", "SVI-318 (PAL)",  MACHINE_SUPPORTS_SAVE)
+COMP( 1983, svi318n, svi318,   0,      svi318n, svi318, driver_device, 0,    "Spectravideo", "SVI-318 (NTSC)", MACHINE_SUPPORTS_SAVE)
+COMP( 1983, svi328,  0,        0,      svi328,  svi328, driver_device, 0,    "Spectravideo", "SVI-328 (PAL)",  MACHINE_SUPPORTS_SAVE)
+COMP( 1983, svi328n, svi328,   0,      svi328n, svi328, driver_device, 0,    "Spectravideo", "SVI-328 (NTSC)", MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 2a4af9dc401..94ae3cf2bd7 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -33696,8 +33696,6 @@ suratkj                         // GX911 (c) 1990 (Japan)
 sv8000                          // Super Vision 8000
 
 @source:svi318.cpp
-sv328n80                        // SVI-328 (NTSC) + SVI-806 80 column card
-sv328p80                        // SVI-328 (PAL) + SVI-806 80 column card
 svi318                          // SVI-318 (PAL)
 svi318n                         // SVI-318 (NTSC)
 svi328                          // SVI-328 (PAL)