diff --git a/src/mess/drivers/svi318.c b/src/mess/drivers/svi318.c index 39e044ca413..e88b739a5a2 100644 --- a/src/mess/drivers/svi318.c +++ b/src/mess/drivers/svi318.c @@ -17,46 +17,46 @@ #include "rendlay.h" static ADDRESS_MAP_START( svi318_mem, AS_PROGRAM, 8, svi318_state ) - AM_RANGE( 0x0000, 0x7fff) AM_READ_BANK("bank1") AM_WRITE(svi318_writemem1 ) - AM_RANGE( 0x8000, 0xbfff) AM_READ_BANK("bank2") AM_WRITE(svi318_writemem2 ) - AM_RANGE( 0xc000, 0xffff) AM_READ_BANK("bank3") AM_WRITE(svi318_writemem3 ) + 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(svi318_writemem1 ) - AM_RANGE( 0x8000, 0xbfff) AM_READ_BANK("bank2") AM_WRITE(svi318_writemem2 ) - AM_RANGE( 0xc000, 0xefff) AM_READ_BANK("bank3") AM_WRITE(svi318_writemem3 ) - AM_RANGE( 0xf000, 0xffff) AM_READ_BANK("bank4") AM_WRITE(svi318_writemem4 ) + 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(svi318_io_ext_r, svi318_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(svi318_ppi_w) - AM_RANGE( 0x98, 0x9a) AM_DEVREAD("ppi8255", i8255_device, read) + 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(svi318_io_ext_r, svi318_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(svi318_ppi_w) - AM_RANGE( 0x98, 0x9a) AM_DEVREAD("ppi8255", i8255_device, read) + 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 /* @@ -101,7 +101,7 @@ behave? Do they need multiple mapping in natural keyboard? */ static INPUT_PORTS_START( svi318 ) - PORT_START("LINE0") + 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('@') @@ -111,7 +111,7 @@ static INPUT_PORTS_START( svi318 ) 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("LINE1") + 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(';') @@ -121,7 +121,7 @@ static INPUT_PORTS_START( svi318 ) 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("LINE2") + 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') @@ -131,7 +131,7 @@ static INPUT_PORTS_START( svi318 ) 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("LINE3") + 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') @@ -141,7 +141,7 @@ static INPUT_PORTS_START( svi318 ) 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("LINE4") + 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') @@ -151,7 +151,7 @@ static INPUT_PORTS_START( svi318 ) 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("LINE5") + 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') @@ -161,7 +161,7 @@ static INPUT_PORTS_START( svi318 ) 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("LINE6") + 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)) @@ -171,7 +171,7 @@ static INPUT_PORTS_START( svi318 ) 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("LINE7") + 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)) @@ -181,7 +181,7 @@ static INPUT_PORTS_START( svi318 ) 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("LINE8") + 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)) @@ -191,10 +191,10 @@ static INPUT_PORTS_START( svi318 ) 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("LINE9") + PORT_START("LINE.9") PORT_BIT (0xff, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_START("LINE10") + PORT_START("LINE.10") PORT_BIT (0xff, IP_ACTIVE_LOW, IPT_UNUSED) PORT_START("JOYSTICKS") @@ -217,7 +217,7 @@ static INPUT_PORTS_START( svi328 ) PORT_INCLUDE( svi318 ) - PORT_MODIFY("LINE9") + 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)) @@ -227,7 +227,7 @@ static INPUT_PORTS_START( svi328 ) 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("LINE10") + 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)) @@ -261,30 +261,30 @@ 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_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_MACHINE_START_OVERRIDE(svi318_state, svi318_pal ) - MCFG_MACHINE_RESET_OVERRIDE(svi318_state, svi318 ) + MCFG_MACHINE_START_OVERRIDE(svi318_state, svi318_pal) + MCFG_MACHINE_RESET_OVERRIDE(svi318_state, svi318) MCFG_DEVICE_ADD("ppi8255", I8255, 0) - MCFG_I8255_IN_PORTA_CB(READ8(svi318_state, svi318_ppi_port_a_r)) - MCFG_I8255_IN_PORTB_CB(READ8(svi318_state, svi318_ppi_port_b_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(svi318_state, svi318_ppi_port_c_w)) + 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, svi318_ins8250_interrupt)) - MCFG_DEVICE_ADD( "ins8250_1", INS8250, 3072000 ) - MCFG_INS8250_OUT_INT_CB(WRITELINE(svi318_state, svi318_ins8250_interrupt)) + 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_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 ) + MCFG_TMS9928A_SCREEN_ADD_PAL("screen") + MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9929a_device, screen_update) /* Sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -293,8 +293,8 @@ static MACHINE_CONFIG_START( svi318, svi318_state ) 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, svi318_psg_port_a_r)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(svi318_state, svi318_psg_port_b_w)) + 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 */ @@ -303,23 +303,23 @@ static MACHINE_CONFIG_START( svi318, svi318_state ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") - MCFG_CASSETTE_ADD( "cassette" ) + MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_FORMATS(svi_cassette_formats) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY) MCFG_CASSETTE_INTERFACE("svi318_cass") MCFG_DEVICE_ADD("wd179x", FD1793, 0) MCFG_WD17XX_DEFAULT_DRIVE2_TAGS - MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(svi318_state,svi_fdc_intrq_w)) - MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(svi318_state,svi_fdc_drq_w)) + MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(svi318_state, fdc_intrq_w)) + MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(svi318_state, fdc_drq_w)) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(svi318_floppy_interface) /* Software lists */ - MCFG_SOFTWARE_LIST_ADD("cass_list","svi318_flop") - MCFG_SOFTWARE_LIST_ADD("disk_list","svi318_cass") + MCFG_SOFTWARE_LIST_ADD("cass_list", "svi318_flop") + MCFG_SOFTWARE_LIST_ADD("disk_list", "svi318_cass") - MCFG_FRAGMENT_ADD( svi318_cartslot ) + MCFG_FRAGMENT_ADD(svi318_cartslot) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -331,14 +331,14 @@ static MACHINE_CONFIG_DERIVED( svi318n, svi318 ) MCFG_DEVICE_REMOVE("tms9928a") MCFG_DEVICE_REMOVE("screen") - MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL_10_738635MHz / 2 ) + 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 ) + MCFG_TMS9928A_SCREEN_ADD_NTSC("screen") + MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update) - MCFG_MACHINE_START_OVERRIDE(svi318_state, svi318_ntsc ) - MCFG_MACHINE_RESET_OVERRIDE(svi318_state, svi318 ) + MCFG_MACHINE_START_OVERRIDE(svi318_state, svi318_ntsc) + MCFG_MACHINE_RESET_OVERRIDE(svi318_state, svi318) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( svi328, svi318 ) @@ -378,33 +378,33 @@ 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_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_MACHINE_START_OVERRIDE(svi318_state, svi318_pal ) - MCFG_MACHINE_RESET_OVERRIDE(svi318_state, svi328_806 ) + MCFG_MACHINE_START_OVERRIDE(svi318_state, svi318_pal) + MCFG_MACHINE_RESET_OVERRIDE(svi318_state, svi328_806) MCFG_DEVICE_ADD("ppi8255", I8255, 0) - MCFG_I8255_IN_PORTA_CB(READ8(svi318_state, svi318_ppi_port_a_r)) - MCFG_I8255_IN_PORTB_CB(READ8(svi318_state, svi318_ppi_port_b_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(svi318_state, svi318_ppi_port_c_w)) + 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, svi318_ins8250_interrupt)) - MCFG_DEVICE_ADD( "ins8250_1", INS8250, 3072000 ) - MCFG_INS8250_OUT_INT_CB(WRITELINE(svi318_state, svi318_ins8250_interrupt)) + 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_DEFAULT_LAYOUT(layout_dualhsxs) - MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL_10_738635MHz / 2 ) + 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_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) @@ -421,7 +421,7 @@ static MACHINE_CONFIG_START( svi328_806, svi318_state ) MCFG_MC6845_CHAR_WIDTH(8) /* ? */ MCFG_MC6845_UPDATE_ROW_CB(svi318_state, crtc_update_row) - MCFG_VIDEO_START_OVERRIDE(svi318_state, svi328_806 ) + MCFG_VIDEO_START_OVERRIDE(svi318_state, svi328_806) /* Sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -430,8 +430,8 @@ static MACHINE_CONFIG_START( svi328_806, svi318_state ) 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, svi318_psg_port_a_r)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(svi318_state, svi318_psg_port_b_w)) + 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 */ @@ -440,19 +440,19 @@ static MACHINE_CONFIG_START( svi328_806, svi318_state ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") - MCFG_CASSETTE_ADD( "cassette" ) + MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_FORMATS(svi_cassette_formats) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY) MCFG_CASSETTE_INTERFACE("svi318_cass") MCFG_DEVICE_ADD("wd179x", FD1793, 0) MCFG_WD17XX_DEFAULT_DRIVE2_TAGS - MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(svi318_state,svi_fdc_intrq_w)) - MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(svi318_state,svi_fdc_drq_w)) + MCFG_WD17XX_INTRQ_CALLBACK(WRITELINE(svi318_state, fdc_intrq_w)) + MCFG_WD17XX_DRQ_CALLBACK(WRITELINE(svi318_state, fdc_drq_w)) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(svi318_floppy_interface) - MCFG_FRAGMENT_ADD( svi318_cartslot ) + MCFG_FRAGMENT_ADD(svi318_cartslot) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -462,7 +462,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( svi328n_806, svi328_806 ) - MCFG_MACHINE_START_OVERRIDE(svi318_state, svi318_ntsc ) + MCFG_MACHINE_START_OVERRIDE(svi318_state, svi318_ntsc) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mess/includes/svi318.h b/src/mess/includes/svi318.h index 997bfbed2e3..531c38f144b 100644 --- a/src/mess/includes/svi318.h +++ b/src/mess/includes/svi318.h @@ -74,17 +74,9 @@ public: m_ins8250_0(*this, "ins8250_0"), m_ins8250_1(*this, "ins8250_1"), m_cart(*this, "cartslot"), - m_line0(*this, "LINE0"), - m_line1(*this, "LINE1"), - m_line2(*this, "LINE2"), - m_line3(*this, "LINE3"), - m_line4(*this, "LINE4"), - m_line5(*this, "LINE5"), - m_line6(*this, "LINE6"), - m_line7(*this, "LINE7"), - m_line8(*this, "LINE8"), - m_line9(*this, "LINE9"), - m_line10(*this, "LINE10"), + m_fd1793(*this, "wd179x"), + m_crtc(*this, "crtc"), + m_line(*this, "LINE"), m_joysticks(*this, "JOYSTICKS"), m_buttons(*this, "BUTTONS"), m_palette(*this, "palette") { } @@ -92,19 +84,19 @@ public: SVI_318 m_svi; int m_centronics_busy; SVI318_FDC_STRUCT m_fdc; - DECLARE_WRITE8_MEMBER(svi318_ppi_w); - DECLARE_READ8_MEMBER(svi318_psg_port_a_r); - DECLARE_WRITE8_MEMBER(svi318_psg_port_b_w); - DECLARE_WRITE8_MEMBER(svi318_fdc_drive_motor_w); - DECLARE_WRITE8_MEMBER(svi318_fdc_density_side_w); - DECLARE_READ8_MEMBER(svi318_fdc_irqdrq_r); + DECLARE_WRITE8_MEMBER(ppi_w); + DECLARE_READ8_MEMBER(psg_port_a_r); + DECLARE_WRITE8_MEMBER(psg_port_b_w); + DECLARE_WRITE8_MEMBER(fdc_drive_motor_w); + DECLARE_WRITE8_MEMBER(fdc_density_side_w); + DECLARE_READ8_MEMBER(fdc_irqdrq_r); DECLARE_WRITE8_MEMBER(svi806_ram_enable_w); - DECLARE_WRITE8_MEMBER(svi318_writemem1); - DECLARE_WRITE8_MEMBER(svi318_writemem2); - DECLARE_WRITE8_MEMBER(svi318_writemem3); - DECLARE_WRITE8_MEMBER(svi318_writemem4); - DECLARE_READ8_MEMBER(svi318_io_ext_r); - DECLARE_WRITE8_MEMBER(svi318_io_ext_w); + DECLARE_WRITE8_MEMBER(writemem1); + DECLARE_WRITE8_MEMBER(writemem2); + DECLARE_WRITE8_MEMBER(writemem3); + DECLARE_WRITE8_MEMBER(writemem4); + DECLARE_READ8_MEMBER(io_ext_r); + DECLARE_WRITE8_MEMBER(io_ext_w); DECLARE_DRIVER_INIT(svi318); DECLARE_MACHINE_START(svi318_pal); DECLARE_MACHINE_RESET(svi318); @@ -112,12 +104,12 @@ public: DECLARE_VIDEO_START(svi328_806); DECLARE_MACHINE_START(svi318_ntsc); DECLARE_WRITE_LINE_MEMBER(vdp_interrupt); - DECLARE_WRITE_LINE_MEMBER(svi318_ins8250_interrupt); - DECLARE_READ8_MEMBER(svi318_ppi_port_a_r); - DECLARE_READ8_MEMBER(svi318_ppi_port_b_r); - DECLARE_WRITE8_MEMBER(svi318_ppi_port_c_w); - DECLARE_WRITE_LINE_MEMBER(svi_fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(svi_fdc_drq_w); + DECLARE_WRITE_LINE_MEMBER(ins8250_interrupt); + DECLARE_READ8_MEMBER(ppi_port_a_r); + DECLARE_READ8_MEMBER(ppi_port_b_r); + DECLARE_WRITE8_MEMBER(ppi_port_c_w); + DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); + DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); bool cart_verify(UINT8 *ROM); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(svi318_cart); DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); @@ -136,17 +128,9 @@ protected: required_device m_ins8250_0; required_device m_ins8250_1; required_device m_cart; - required_ioport m_line0; - required_ioport m_line1; - required_ioport m_line2; - required_ioport m_line3; - required_ioport m_line4; - required_ioport m_line5; - required_ioport m_line6; - required_ioport m_line7; - required_ioport m_line8; - required_ioport m_line9; - required_ioport m_line10; + required_device m_fd1793; + optional_device m_crtc; + required_ioport_array<11> m_line; required_ioport m_joysticks; required_ioport m_buttons; public: diff --git a/src/mess/machine/svi318.c b/src/mess/machine/svi318.c index 2f630f79b65..c2d6bdb669b 100644 --- a/src/mess/machine/svi318.c +++ b/src/mess/machine/svi318.c @@ -25,13 +25,14 @@ enum { /* Serial ports */ -WRITE_LINE_MEMBER(svi318_state::svi318_ins8250_interrupt) +WRITE_LINE_MEMBER(svi318_state::ins8250_interrupt) { if (m_svi.bankLow != SVI_CART) { m_maincpu->set_input_line(0, (state ? HOLD_LINE : CLEAR_LINE)); } } + #if 0 static INS8250_REFRESH_CONNECT( svi318_com_refresh_connected ) { @@ -86,18 +87,15 @@ DEVICE_IMAGE_LOAD_MEMBER( svi318_state, svi318_cart ) 8 CASR Cassette, Read data */ -READ8_MEMBER(svi318_state::svi318_ppi_port_a_r) +READ8_MEMBER(svi318_state::ppi_port_a_r) { int data = 0x0f; if (m_cassette->input() > 0.0038) - { data |= 0x80; - } if (!m_cassette->exists()) - { data |= 0x40; - } + data |= m_buttons->read() & 0x30; return data; @@ -116,24 +114,12 @@ READ8_MEMBER(svi318_state::svi318_ppi_port_a_r) 8 IN7 Keyboard, Column status of selected line */ -READ8_MEMBER(svi318_state::svi318_ppi_port_b_r) +READ8_MEMBER(svi318_state::ppi_port_b_r) { - switch (m_svi.keyboard_row) - { - case 0: return m_line0->read(); - case 1: return m_line1->read(); - case 2: return m_line2->read(); - case 3: return m_line3->read(); - case 4: return m_line4->read(); - case 5: return m_line5->read(); - case 6: return m_line6->read(); - case 7: return m_line7->read(); - case 8: return m_line8->read(); - case 9: return m_line9->read(); - case 10: return m_line10->read(); - } - - return 0xff; + if (m_svi.keyboard_row <= 10) + return m_line[m_svi.keyboard_row]->read(); + else + return 0xff; } /* @@ -149,7 +135,7 @@ READ8_MEMBER(svi318_state::svi318_ppi_port_b_r) 8 SOUND Keyboard, Click sound bit (pulse) */ -WRITE8_MEMBER(svi318_state::svi318_ppi_port_c_w) +WRITE8_MEMBER(svi318_state::ppi_port_c_w) { int val; @@ -169,10 +155,10 @@ WRITE8_MEMBER(svi318_state::svi318_ppi_port_c_w) /* cassette signal write */ m_cassette->output((data & 0x20) ? -1.0 : +1.0); - m_svi.keyboard_row = data & 0x0F; + m_svi.keyboard_row = data & 0x0f; } -WRITE8_MEMBER(svi318_state::svi318_ppi_w) +WRITE8_MEMBER(svi318_state::ppi_w) { m_ppi->write(space, offset + 2, data); } @@ -193,7 +179,7 @@ WRITE8_MEMBER(svi318_state::svi318_ppi_w) 8 RIGHT2 Joystick 2, Right */ -READ8_MEMBER(svi318_state::svi318_psg_port_a_r) +READ8_MEMBER(svi318_state::psg_port_a_r) { return m_joysticks->read(); } @@ -214,7 +200,7 @@ READ8_MEMBER(svi318_state::svi318_psg_port_a_r) with RAM are disabled. */ -WRITE8_MEMBER(svi318_state::svi318_psg_port_b_w) +WRITE8_MEMBER(svi318_state::psg_port_b_w) { if ( (m_svi.bank_switch ^ data) & 0x20) set_led_status (machine(), 0, !(data & 0x20) ); @@ -225,41 +211,38 @@ WRITE8_MEMBER(svi318_state::svi318_psg_port_b_w) /* Disk drives */ -WRITE_LINE_MEMBER(svi318_state::svi_fdc_intrq_w) +WRITE_LINE_MEMBER(svi318_state::fdc_intrq_w) { m_fdc.irq = state; } -WRITE_LINE_MEMBER(svi318_state::svi_fdc_drq_w) +WRITE_LINE_MEMBER(svi318_state::fdc_drq_w) { m_fdc.drq = state; } -WRITE8_MEMBER(svi318_state::svi318_fdc_drive_motor_w) +WRITE8_MEMBER(svi318_state::fdc_drive_motor_w) { - fd1793_device *fdc = machine().device("wd179x"); switch (data & 3) { case 1: - fdc->set_drive(0); + m_fd1793->set_drive(0); m_fdc.driveselect = 0; break; case 2: - fdc->set_drive(1); + m_fd1793->set_drive(1); m_fdc.driveselect = 1; break; } } -WRITE8_MEMBER(svi318_state::svi318_fdc_density_side_w) +WRITE8_MEMBER(svi318_state::fdc_density_side_w) { - fd1793_device *fdc = machine().device("wd179x"); - - fdc->dden_w(BIT(data, 0)); - fdc->set_side(BIT(data, 1)); + m_fd1793->dden_w(BIT(data, 0)); + m_fd1793->set_side(BIT(data, 1)); } -READ8_MEMBER(svi318_state::svi318_fdc_irqdrq_r) +READ8_MEMBER(svi318_state::fdc_irqdrq_r) { UINT8 result = 0; @@ -272,21 +255,19 @@ READ8_MEMBER(svi318_state::svi318_fdc_irqdrq_r) MC6845_UPDATE_ROW( svi318_state::crtc_update_row ) { const rgb_t *palette = m_palette->palette()->entry_list_raw(); - int i; - for( i = 0; i < x_count; i++ ) + for (int i = 0; i < x_count; i++) { - int j; - UINT8 data = m_svi.svi806_gfx[ m_svi.svi806_ram->u8(( ma + i ) & 0x7FF) * 16 + ra ]; + UINT8 data = m_svi.svi806_gfx[m_svi.svi806_ram->u8((ma + i) & 0x7ff) * 16 + ra]; - if ( i == cursor_x ) + if (i == cursor_x) { data = 0xFF; } - for( j=0; j < 8; j++ ) + for (int j = 0; j < 8; j++) { - bitmap.pix32(y, i * 8 + j ) = palette[TMS9928A_PALETTE_SIZE + ( ( data & 0x80 ) ? 1 : 0 )]; + bitmap.pix32(y, i * 8 + j) = palette[TMS9928A_PALETTE_SIZE + BIT(data, 7)]; data = data << 1; } } @@ -298,24 +279,24 @@ void svi318_state::svi318_80col_init() { /* 2K RAM, but allocating 4KB to make banking easier */ /* The upper 2KB will be set to FFs and will never be written to */ - m_svi.svi806_ram = machine().memory().region_alloc("gfx2", 0x1000, 1, ENDIANNESS_LITTLE ); - memset( m_svi.svi806_ram->base(), 0x00, 0x800 ); - memset( m_svi.svi806_ram->base() + 0x800, 0xFF, 0x800 ); + m_svi.svi806_ram = machine().memory().region_alloc("gfx2", 0x1000, 1, ENDIANNESS_LITTLE); + memset(m_svi.svi806_ram->base(), 0x00, 0x800); + memset(m_svi.svi806_ram->base() + 0x800, 0xff, 0x800); m_svi.svi806_gfx = memregion("gfx1")->base(); } WRITE8_MEMBER(svi318_state::svi806_ram_enable_w) { - m_svi.svi806_ram_enabled = ( data & 0x01 ); + m_svi.svi806_ram_enabled = (data & 0x01); svi318_set_banks(); } -VIDEO_START_MEMBER(svi318_state,svi328_806) +VIDEO_START_MEMBER(svi318_state, svi328_806) { } -MACHINE_RESET_MEMBER(svi318_state,svi328_806) +MACHINE_RESET_MEMBER(svi318_state, svi328_806) { MACHINE_RESET_CALL_MEMBER(svi318); @@ -324,8 +305,8 @@ MACHINE_RESET_MEMBER(svi318_state,svi328_806) svi318_set_banks(); /* Set SVI-806 80 column card palette */ - m_palette->set_pen_color( TMS9928A_PALETTE_SIZE, 0, 0, 0 ); /* Monochrome black */ - m_palette->set_pen_color( TMS9928A_PALETTE_SIZE+1, 0, 224, 0 ); /* Monochrome green */ + m_palette->set_pen_color(TMS9928A_PALETTE_SIZE, 0, 0, 0); /* Monochrome black */ + m_palette->set_pen_color(TMS9928A_PALETTE_SIZE+1, 0, 224, 0); /* Monochrome green */ } /* Init functions */ @@ -452,23 +433,21 @@ static const UINT8 cc_ex[0x100] = { }; -DRIVER_INIT_MEMBER(svi318_state,svi318) +DRIVER_INIT_MEMBER(svi318_state, svi318) { /* z80 stuff */ - m_maincpu->z80_set_cycle_tables( cc_op, cc_cb, cc_ed, cc_xy, cc_xycb, cc_ex ); + m_maincpu->z80_set_cycle_tables(cc_op, cc_cb, cc_ed, cc_xy, cc_xycb, cc_ex); - memset(&m_svi, 0, sizeof (m_svi) ); + memset(&m_svi, 0, sizeof(m_svi)); - if ( ! strcmp( machine().system().name, "svi318" ) || ! strcmp( machine().system().name, "svi318n" ) ) - { + if (!strcmp(machine().system().name, "svi318") || !strcmp(machine().system().name, "svi318n")) m_svi.svi318 = 1; - } m_maincpu->set_input_line_vector(0, 0xff); /* memory */ m_svi.empty_bank = auto_alloc_array(machine(), UINT8, 0x8000); - memset (m_svi.empty_bank, 0xff, 0x8000); + memset(m_svi.empty_bank, 0xff, 0x8000); } MACHINE_START_MEMBER(svi318_state, svi318_ntsc) @@ -486,10 +465,9 @@ MACHINE_START_MEMBER(svi318_state, svi318_pal) static void svi318_load_proc(device_image_interface &image) { svi318_state *state = image.device().machine().driver_data(); - int size; + int size = image.length(); int id = floppy_get_drive(&image.device()); - size = image.length(); switch (size) { case 172032: /* SVI-328 SSDD */ @@ -504,14 +482,12 @@ static void svi318_load_proc(device_image_interface &image) } } -MACHINE_RESET_MEMBER(svi318_state,svi318) +MACHINE_RESET_MEMBER(svi318_state, svi318) { - int drive; - m_svi.bank_switch = 0xff; svi318_set_banks(); - for(drive=0;drive<2;drive++) + for (int drive = 0; drive < 2; drive++) { floppy_get_device(machine(), drive)->floppy_install_load_proc(svi318_load_proc); } @@ -519,45 +495,45 @@ MACHINE_RESET_MEMBER(svi318_state,svi318) /* Memory */ -WRITE8_MEMBER(svi318_state::svi318_writemem1) +WRITE8_MEMBER(svi318_state::writemem1) { - if ( m_svi.bankLow_read_only ) + if (m_svi.bankLow_read_only) return; m_svi.bankLow_ptr[offset] = data; } -WRITE8_MEMBER(svi318_state::svi318_writemem2) +WRITE8_MEMBER(svi318_state::writemem2) { - if ( m_svi.bankHigh1_read_only) + if (m_svi.bankHigh1_read_only) return; m_svi.bankHigh1_ptr[offset] = data; } -WRITE8_MEMBER(svi318_state::svi318_writemem3) +WRITE8_MEMBER(svi318_state::writemem3) { - if ( m_svi.bankHigh2_read_only) + if (m_svi.bankHigh2_read_only) return; m_svi.bankHigh2_ptr[offset] = data; } -WRITE8_MEMBER(svi318_state::svi318_writemem4) +WRITE8_MEMBER(svi318_state::writemem4) { - if ( m_svi.svi806_ram_enabled ) + if (m_svi.svi806_ram_enabled) { - if ( offset < 0x800 ) + if (offset < 0x800) { m_svi.svi806_ram->u8(offset) = data; } } else { - if ( m_svi.bankHigh2_read_only ) + if (m_svi.bankHigh2_read_only) return; - m_svi.bankHigh2_ptr[ 0x3000 + offset] = data; + m_svi.bankHigh2_ptr[0x3000 + offset] = data; } } @@ -650,20 +626,20 @@ void svi318_state::svi318_set_banks() m_svi.bankHigh1_ptr = m_cart_rom->base(); } - membank("bank1")->set_base(m_svi.bankLow_ptr ); - membank("bank2")->set_base(m_svi.bankHigh1_ptr ); - membank("bank3")->set_base(m_svi.bankHigh2_ptr ); + membank("bank1")->set_base(m_svi.bankLow_ptr); + membank("bank2")->set_base(m_svi.bankHigh1_ptr); + membank("bank3")->set_base(m_svi.bankHigh2_ptr); /* SVI-806 80 column card specific banking */ - if ( m_svi.svi806_present ) + if (m_svi.svi806_present) { - if ( m_svi.svi806_ram_enabled ) + if (m_svi.svi806_ram_enabled) { - membank("bank4")->set_base(m_svi.svi806_ram ); + membank("bank4")->set_base(m_svi.svi806_ram); } else { - membank("bank4")->set_base(m_svi.bankHigh2_ptr + 0x3000 ); + membank("bank4")->set_base(m_svi.bankHigh2_ptr + 0x3000); } } } @@ -675,23 +651,15 @@ WRITE_LINE_MEMBER(svi318_state::write_centronics_busy) m_centronics_busy = state; } -READ8_MEMBER(svi318_state::svi318_io_ext_r) +READ8_MEMBER(svi318_state::io_ext_r) { - UINT8 data = 0xff; - device_t *device; - if (m_svi.bankLow == SVI_CART) - { return 0xff; - } - fd1793_device *fdc = machine().device("wd179x"); - - switch( offset ) + switch (offset) { case 0x12: - data = 0xfe | m_centronics_busy; - break; + return 0xfe | m_centronics_busy; case 0x20: case 0x21: @@ -701,56 +669,46 @@ READ8_MEMBER(svi318_state::svi318_io_ext_r) case 0x25: case 0x26: case 0x27: - data = m_ins8250_0->ins8250_r(space, offset & 7); - break; + return m_ins8250_0->ins8250_r(space, offset & 7); case 0x28: case 0x29: - case 0x2A: - case 0x2B: - case 0x2C: - case 0x2D: - case 0x2E: - case 0x2F: - data = m_ins8250_1->ins8250_r(space, offset & 7); - break; + case 0x2a: + case 0x2b: + case 0x2c: + case 0x2d: + case 0x2e: + case 0x2f: + return m_ins8250_1->ins8250_r(space, offset & 7); case 0x30: - data = fdc->status_r(space, 0); - break; + return m_fd1793->status_r(space, 0); + case 0x31: - data = fdc->track_r(space, 0); - break; + return m_fd1793->track_r(space, 0); + case 0x32: - data = fdc->sector_r(space, 0); - break; + return m_fd1793->sector_r(space, 0); + case 0x33: - data = fdc->data_r(space, 0); - break; + return m_fd1793->data_r(space, 0); + case 0x34: - data = svi318_fdc_irqdrq_r(space, 0); - break; + return fdc_irqdrq_r(space, 0); + case 0x51: - device = machine().device("crtc"); - data = downcast(device)->register_r( space, offset ); - break; + return m_crtc->register_r(space, offset); } - return data; + return 0xff; } -WRITE8_MEMBER(svi318_state::svi318_io_ext_w) +WRITE8_MEMBER(svi318_state::io_ext_w) { - device_t *device; - if (m_svi.bankLow == SVI_CART) - { return; - } - fd1793_device *fdc = machine().device("wd179x"); - - switch( offset ) + switch (offset) { case 0x10: m_cent_data_out->write(space, 0, data); @@ -783,31 +741,29 @@ WRITE8_MEMBER(svi318_state::svi318_io_ext_w) break; case 0x30: - fdc->command_w(space, 0, data); + m_fd1793->command_w(space, 0, data); break; case 0x31: - fdc->track_w(space, 0, data); + m_fd1793->track_w(space, 0, data); break; case 0x32: - fdc->sector_w(space, 0, data); + m_fd1793->sector_w(space, 0, data); break; case 0x33: - fdc->data_w(space, 0, data); + m_fd1793->data_w(space, 0, data); break; case 0x34: - svi318_fdc_drive_motor_w(space, 0, data); + fdc_drive_motor_w(space, 0, data); break; case 0x38: - svi318_fdc_density_side_w(space, 0, data); + fdc_density_side_w(space, 0, data); break; case 0x50: - device = machine().device("crtc"); - downcast(device)->address_w(space, offset, data); + m_crtc->address_w(space, offset, data); break; case 0x51: - device = machine().device("crtc"); - downcast(device)->register_w(space, offset, data); + m_crtc->register_w(space, offset, data); break; case 0x58: