From a07a220d421d46941b9384b91ca6fbd98f8c6232 Mon Sep 17 00:00:00 2001 From: mooglyguy Date: Fri, 20 Dec 2019 07:07:26 +0100 Subject: [PATCH] -z80ne.cpp: Split further into subclasses, removed MACHINE_START_OVERRIDE and MACHINE_RESET_OVERRIDE. [Ryan Holtz] --- src/mame/drivers/z80ne.cpp | 386 ++++++++++++++++++------------------- src/mame/includes/z80ne.h | 125 +++++++----- src/mame/machine/z80ne.cpp | 87 +++------ 3 files changed, 293 insertions(+), 305 deletions(-) diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp index 9321758c89a..e1da99443f1 100644 --- a/src/mame/drivers/z80ne.cpp +++ b/src/mame/drivers/z80ne.cpp @@ -113,7 +113,7 @@ /* LX.382 CPU Board RAM */ /* LX.382 CPU Board EPROM */ -void z80ne_state::z80ne_mem(address_map &map) +void z80ne_state::main_mem(address_map &map) { map(0x0000, 0x03ff).bankrw("bank1"); map(0x0400, 0x7fff).ram(); @@ -121,7 +121,7 @@ void z80ne_state::z80ne_mem(address_map &map) map(0x8400, 0xffff).nopr().nopw(); } -void z80ne_state::z80net_mem(address_map &map) +void z80net_state::main_mem(address_map &map) { map(0x0000, 0x03ff).bankrw("bank1"); map(0x0400, 0x7fff).ram(); @@ -131,7 +131,7 @@ void z80ne_state::z80net_mem(address_map &map) map(0xee00, 0xffff).ram(); } -void z80ne_state::z80netb_mem(address_map &map) +void z80netb_state::main_mem(address_map &map) { map(0x0000, 0x3fff).rom(); map(0x4000, 0xebff).ram(); @@ -139,7 +139,7 @@ void z80ne_state::z80netb_mem(address_map &map) map(0xee00, 0xffff).ram(); } -void z80ne_state::z80ne_io(address_map &map) +void z80ne_state::main_io(address_map &map) { map.global_mask(0xff); map(0xee, 0xee).rw(m_uart, FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); @@ -147,17 +147,17 @@ void z80ne_state::z80ne_io(address_map &map) map(0xf0, 0xff).rw(FUNC(z80ne_state::lx383_r), FUNC(z80ne_state::lx383_w)); } -void z80ne_state::z80net_io(address_map &map) +void z80net_state::main_io(address_map &map) { map.global_mask(0xff); - map(0xea, 0xea).r(FUNC(z80ne_state::lx387_data_r)); - map(0xeb, 0xeb).r(FUNC(z80ne_state::lx388_read_field_sync)); + map(0xea, 0xea).r(FUNC(z80net_state::lx387_data_r)); + map(0xeb, 0xeb).r(FUNC(z80net_state::lx388_read_field_sync)); map(0xee, 0xee).rw(m_uart, FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit)); - map(0xef, 0xef).rw(FUNC(z80ne_state::lx385_ctrl_r), FUNC(z80ne_state::lx385_ctrl_w)); - map(0xf0, 0xff).rw(FUNC(z80ne_state::lx383_r), FUNC(z80ne_state::lx383_w)); + map(0xef, 0xef).rw(FUNC(z80net_state::lx385_ctrl_r), FUNC(z80net_state::lx385_ctrl_w)); + map(0xf0, 0xff).rw(FUNC(z80net_state::lx383_r), FUNC(z80net_state::lx383_w)); } -void z80netf_state::z80netf_mem(address_map &map) +void z80netf_state::main_mem(address_map &map) { map(0x0000, 0x03ff).bankrw("bank1"); map(0x0400, 0x3fff).bankrw("bank2"); @@ -171,7 +171,7 @@ void z80netf_state::z80netf_mem(address_map &map) map(0xf400, 0xffff).nopr().nopw(); } -void z80netf_state::z80netf_io(address_map &map) +void z80netf_state::main_io(address_map &map) { map.global_mask(0xff); map(0xd0, 0xd7).rw(FUNC(z80netf_state::lx390_fdc_r), FUNC(z80netf_state::lx390_fdc_w)); @@ -190,172 +190,172 @@ void z80netf_state::z80netf_io(address_map &map) static INPUT_PORTS_START( z80ne ) -/* LX.384 Hex Keyboard and Display */ -/* - * In natural mode the CTRL key is mapped on shift - */ -PORT_START("ROW0") /* IN0 keys row 0 */ -PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 0") PORT_CODE(KEYCODE_0) //PORT_CHAR('0') PORT_CHAR('=') -PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 1") PORT_CODE(KEYCODE_1) //PORT_CHAR('1') PORT_CHAR('!') -PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 2") PORT_CODE(KEYCODE_2) //PORT_CHAR('2') PORT_CHAR('"') -PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 3") PORT_CODE(KEYCODE_3) //PORT_CHAR('3') PORT_CHAR(0x00a3) // ?? -PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 4") PORT_CODE(KEYCODE_4) //PORT_CHAR('4') PORT_CHAR('$') -PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 5") PORT_CODE(KEYCODE_5) //PORT_CHAR('5') PORT_CHAR('%') -PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 6") PORT_CODE(KEYCODE_6) //PORT_CHAR('6') PORT_CHAR('&') -PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 7") PORT_CODE(KEYCODE_7) //PORT_CHAR('7') PORT_CHAR('/') + /* LX.384 Hex Keyboard and Display */ + /* + * In natural mode the CTRL key is mapped on shift + */ + PORT_START("ROW0") /* IN0 keys row 0 */ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 0") PORT_CODE(KEYCODE_0) //PORT_CHAR('0') PORT_CHAR('=') + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 1") PORT_CODE(KEYCODE_1) //PORT_CHAR('1') PORT_CHAR('!') + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 2") PORT_CODE(KEYCODE_2) //PORT_CHAR('2') PORT_CHAR('"') + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 3") PORT_CODE(KEYCODE_3) //PORT_CHAR('3') PORT_CHAR(0x00a3) // ?? + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 4") PORT_CODE(KEYCODE_4) //PORT_CHAR('4') PORT_CHAR('$') + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 5") PORT_CODE(KEYCODE_5) //PORT_CHAR('5') PORT_CHAR('%') + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 6") PORT_CODE(KEYCODE_6) //PORT_CHAR('6') PORT_CHAR('&') + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 7") PORT_CODE(KEYCODE_7) //PORT_CHAR('7') PORT_CHAR('/') -PORT_START("ROW1") /* IN1 keys row 1 */ -PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 8") PORT_CODE(KEYCODE_8) //PORT_CHAR('8') PORT_CHAR('(') -PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 9") PORT_CODE(KEYCODE_9) //PORT_CHAR('9') PORT_CHAR(')') -PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 A") PORT_CODE(KEYCODE_A) //PORT_CHAR('a') PORT_CHAR('A') -PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 B") PORT_CODE(KEYCODE_B) //PORT_CHAR('b') PORT_CHAR('B') -PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 C") PORT_CODE(KEYCODE_C) //PORT_CHAR('c') PORT_CHAR('C') -PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 D") PORT_CODE(KEYCODE_D) //PORT_CHAR('d') PORT_CHAR('D') -PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 E") PORT_CODE(KEYCODE_E) //PORT_CHAR('e') PORT_CHAR('E') -PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 F") PORT_CODE(KEYCODE_F) //PORT_CHAR('f') PORT_CHAR('F') + PORT_START("ROW1") /* IN1 keys row 1 */ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 8") PORT_CODE(KEYCODE_8) //PORT_CHAR('8') PORT_CHAR('(') + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 9") PORT_CODE(KEYCODE_9) //PORT_CHAR('9') PORT_CHAR(')') + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 A") PORT_CODE(KEYCODE_A) //PORT_CHAR('a') PORT_CHAR('A') + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 B") PORT_CODE(KEYCODE_B) //PORT_CHAR('b') PORT_CHAR('B') + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 C") PORT_CODE(KEYCODE_C) //PORT_CHAR('c') PORT_CHAR('C') + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 D") PORT_CODE(KEYCODE_D) //PORT_CHAR('d') PORT_CHAR('D') + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 E") PORT_CODE(KEYCODE_E) //PORT_CHAR('e') PORT_CHAR('E') + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 F") PORT_CODE(KEYCODE_F) //PORT_CHAR('f') PORT_CHAR('F') -PORT_START("CTRL") /* CONTROL key */ -PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) -PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) -PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) -PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 CTRL") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) //PORT_CHAR(UCHAR_SHIFT_1) -PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) -PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) -PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) -PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_START("CTRL") /* CONTROL key */ + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 CTRL") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) //PORT_CHAR(UCHAR_SHIFT_1) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) -PORT_START("RST") /* RESET key */ -PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 Reset") PORT_CODE(KEYCODE_F3) PORT_CHANGED_MEMBER(DEVICE_SELF, z80ne_state, z80ne_reset, 0) + PORT_START("RST") /* RESET key */ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 Reset") PORT_CODE(KEYCODE_F3) PORT_CHANGED_MEMBER(DEVICE_SELF, z80ne_state, z80ne_reset, 0) -/* Settings */ -PORT_START("LX.385") -PORT_CONFNAME(0x07, 0x04, "LX.385 Cassette: P1,P3 Data Rate") -PORT_CONFSETTING( 0x01, "A-B: 300 bps") -PORT_CONFSETTING( 0x02, "A-C: 600 bps") -PORT_CONFSETTING( 0x04, "A-D: 1200 bps") -PORT_CONFNAME( 0x08, 0x00, "LX.385: P4 Parity Check") -PORT_CONFSETTING( 0x00, "Parity Check Enabled") -PORT_CONFSETTING( 0x08, "Parity Check Disabled") + /* Settings */ + PORT_START("LX.385") + PORT_CONFNAME(0x07, 0x04, "LX.385 Cassette: P1,P3 Data Rate") + PORT_CONFSETTING( 0x01, "A-B: 300 bps") + PORT_CONFSETTING( 0x02, "A-C: 600 bps") + PORT_CONFSETTING( 0x04, "A-D: 1200 bps") + PORT_CONFNAME( 0x08, 0x00, "LX.385: P4 Parity Check") + PORT_CONFSETTING( 0x00, "Parity Check Enabled") + PORT_CONFSETTING( 0x08, "Parity Check Disabled") INPUT_PORTS_END static INPUT_PORTS_START( z80net ) -PORT_INCLUDE( z80ne ) + PORT_INCLUDE( z80ne ) -/* LX.387 Keyboard BREAK key */ -PORT_START("LX387_BRK") -PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Break") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT)) PORT_CHANGED_MEMBER(DEVICE_SELF, z80ne_state, z80ne_nmi, 0) + /* LX.387 Keyboard BREAK key */ + PORT_START("LX387_BRK") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Break") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT)) PORT_CHANGED_MEMBER(DEVICE_SELF, z80net_state, z80net_nmi, 0) -/* LX.387 Keyboard (Encoded by KR2376) */ + /* LX.387 Keyboard (Encoded by KR2376) */ -PORT_START("X0") -PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_START("X0") + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_START("X1") -PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_START("X1") + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_START("X2") -PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=') -PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') -PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CHAR('_') + PORT_START("X2") + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=') + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CHAR('_') -PORT_START("X3") -PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') -PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('*') -PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') -PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('`') PORT_CHAR('@') -PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) PORT_NAME("Del") -PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{') -PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}') -PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_NAME("CR") -PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_CHAR(10) PORT_NAME("LF") -PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_START("X3") + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0') + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('*') + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('`') PORT_CHAR('@') + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) PORT_NAME("Del") + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{') + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}') + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_NAME("CR") + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_CHAR(10) PORT_NAME("LF") + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_START("X4") -PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+') -PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') -PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') -PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') -PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') -PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') -PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') -PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') -PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') -PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') -PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') + PORT_START("X4") + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+') + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') -PORT_START("X5") -PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') -PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') -PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') -PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') -PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('c') PORT_CHAR('G') -PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') -PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') -PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') -PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') -PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) -PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) + PORT_START("X5") + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('c') PORT_CHAR('G') + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) -PORT_START("X6") -PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') -PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') -PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') -PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') -PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') -PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') -PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') -PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') -PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') + PORT_START("X6") + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') -PORT_START("X7") -PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') -PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') -PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') -PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') -PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') -PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') -PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') -PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"') -PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') -PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('^') PORT_CHAR('~') -PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|') + PORT_START("X7") + PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') + PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') + PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"') + PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('^') PORT_CHAR('~') + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|') -PORT_START("MODIFIERS") -PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) -PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_MAMEKEY(LCONTROL)) PORT_CHAR(UCHAR_MAMEKEY(RCONTROL)) -PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_TOGGLE + PORT_START("MODIFIERS") + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_MAMEKEY(LCONTROL)) PORT_CHAR(UCHAR_MAMEKEY(RCONTROL)) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_TOGGLE INPUT_PORTS_END @@ -364,15 +364,15 @@ static INPUT_PORTS_START( z80netf ) PORT_INCLUDE( z80net ) -/* Settings */ -PORT_START("CONFIG") -PORT_CONFNAME(0x07, 0x01, "Boot EPROM") -PORT_CONFSETTING( 0x01, "EP382 Hex Monitor") -PORT_CONFSETTING( 0x02, "EP548 16k BASIC") -PORT_CONFSETTING( 0x03, "EP390 Boot Loader for 5.5k floppy BASIC") -PORT_CONFSETTING( 0x04, "EP1390 Boot Loader for NE DOS 1.0/1.5") -PORT_CONFSETTING( 0x05, "EP2390 Boot Loader for NE DOS G.1") -PORT_BIT(0xf8, 0xf8, IPT_UNUSED) + /* Settings */ + PORT_START("CONFIG") + PORT_CONFNAME(0x07, 0x01, "Boot EPROM") + PORT_CONFSETTING( 0x01, "EP382 Hex Monitor") + PORT_CONFSETTING( 0x02, "EP548 16k BASIC") + PORT_CONFSETTING( 0x03, "EP390 Boot Loader for 5.5k floppy BASIC") + PORT_CONFSETTING( 0x04, "EP1390 Boot Loader for NE DOS 1.0/1.5") + PORT_CONFSETTING( 0x05, "EP2390 Boot Loader for NE DOS G.1") + PORT_BIT(0xf8, 0xf8, IPT_UNUSED) INPUT_PORTS_END @@ -419,11 +419,8 @@ void z80ne_state::z80ne(machine_config &config) { /* basic machine hardware */ Z80(config, m_maincpu, Z80NE_CPU_SPEED_HZ); - m_maincpu->set_addrmap(AS_PROGRAM, &z80ne_state::z80ne_mem); - m_maincpu->set_addrmap(AS_IO, &z80ne_state::z80ne_io); - - MCFG_MACHINE_START_OVERRIDE(z80ne_state,z80ne) - MCFG_MACHINE_RESET_OVERRIDE(z80ne_state,z80ne) + m_maincpu->set_addrmap(AS_PROGRAM, &z80ne_state::main_mem); + m_maincpu->set_addrmap(AS_IO, &z80ne_state::main_io); AY31015(config, m_uart); @@ -452,7 +449,7 @@ void z80ne_state::z80ne(machine_config &config) //SOFTWARE_LIST(config, "cass_list").set_original("z80ne_cass"); } -void z80ne_state::lx387(machine_config &config) +void z80net_state::lx387(machine_config &config) { KR2376_ST(config, m_lx387_kr2376, 50000); m_lx387_kr2376->x<0>().set_ioport("X0"); @@ -463,19 +460,16 @@ void z80ne_state::lx387(machine_config &config) m_lx387_kr2376->x<5>().set_ioport("X5"); m_lx387_kr2376->x<6>().set_ioport("X6"); m_lx387_kr2376->x<7>().set_ioport("X7"); - m_lx387_kr2376->shift().set(FUNC(z80ne_state::lx387_shift_r)); - m_lx387_kr2376->control().set(FUNC(z80ne_state::lx387_control_r)); + m_lx387_kr2376->shift().set(FUNC(z80net_state::lx387_shift_r)); + m_lx387_kr2376->control().set(FUNC(z80net_state::lx387_control_r)); } -void z80ne_state::z80net(machine_config &config) +void z80net_state::z80net(machine_config &config) { z80ne(config); - m_maincpu->set_addrmap(AS_PROGRAM, &z80ne_state::z80net_mem); - m_maincpu->set_addrmap(AS_IO, &z80ne_state::z80net_io); - - MCFG_MACHINE_START_OVERRIDE(z80ne_state, z80net ) - MCFG_MACHINE_RESET_OVERRIDE(z80ne_state, z80net ) + m_maincpu->set_addrmap(AS_PROGRAM, &z80net_state::main_mem); + m_maincpu->set_addrmap(AS_IO, &z80net_state::main_io); lx387(config); @@ -484,7 +478,7 @@ void z80ne_state::z80net(machine_config &config) MC6847_PAL(config, m_vdg, 4.433619_MHz_XTAL); m_vdg->set_screen("lx388"); - m_vdg->input_callback().set(FUNC(z80ne_state::lx388_mc6847_videoram_r)); + m_vdg->input_callback().set(FUNC(z80net_state::lx388_mc6847_videoram_r)); // AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND // other lines not connected @@ -496,20 +490,17 @@ void z80ne_state::z80net(machine_config &config) SOFTWARE_LIST(config, "cass_list").set_original("z80ne_cass"); } -void z80ne_state::z80netb(machine_config &config) +void z80netb_state::z80netb(machine_config &config) { /* basic machine hardware */ Z80(config, m_maincpu, Z80NE_CPU_SPEED_HZ); - m_maincpu->set_addrmap(AS_PROGRAM, &z80ne_state::z80netb_mem); - m_maincpu->set_addrmap(AS_IO, &z80ne_state::z80net_io); - - MCFG_MACHINE_START_OVERRIDE(z80ne_state,z80netb) - MCFG_MACHINE_RESET_OVERRIDE(z80ne_state,z80netb) + m_maincpu->set_addrmap(AS_PROGRAM, &z80netb_state::main_mem); + m_maincpu->set_addrmap(AS_IO, &z80netb_state::main_io); AY31015(config, m_uart); CLOCK(config, m_uart_clock, 4800); - m_uart_clock->signal_handler().set(FUNC(z80ne_state::lx385_uart_tx_clock_w)); + m_uart_clock->signal_handler().set(FUNC(z80netb_state::lx385_uart_tx_clock_w)); m_uart_clock->signal_handler().append(m_uart, FUNC(ay31015_device::write_rcp)); SPEAKER(config, "mono").front_center(); @@ -531,7 +522,7 @@ void z80ne_state::z80netb(machine_config &config) MC6847_PAL(config, m_vdg, 4.433619_MHz_XTAL); m_vdg->set_screen("lx388"); - m_vdg->input_callback().set(FUNC(z80ne_state::lx388_mc6847_videoram_r)); + m_vdg->input_callback().set(FUNC(z80netb_state::lx388_mc6847_videoram_r)); // AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND // other lines not connected @@ -547,11 +538,8 @@ void z80netf_state::z80netf(machine_config &config) { /* basic machine hardware */ Z80(config, m_maincpu, Z80NE_CPU_SPEED_HZ); - m_maincpu->set_addrmap(AS_PROGRAM, &z80netf_state::z80netf_mem); - m_maincpu->set_addrmap(AS_IO, &z80netf_state::z80netf_io); - - MCFG_MACHINE_START_OVERRIDE(z80netf_state,z80netf) - MCFG_MACHINE_RESET_OVERRIDE(z80netf_state,z80netf) + m_maincpu->set_addrmap(AS_PROGRAM, &z80netf_state::main_mem); + m_maincpu->set_addrmap(AS_IO, &z80netf_state::main_io); AY31015(config, m_uart); @@ -578,7 +566,7 @@ void z80netf_state::z80netf(machine_config &config) MC6847_PAL(config, m_vdg, 4.433619_MHz_XTAL); m_vdg->set_screen("lx388"); - m_vdg->input_callback().set(FUNC(z80ne_state::lx388_mc6847_videoram_r)); + m_vdg->input_callback().set(FUNC(z80netf_state::lx388_mc6847_videoram_r)); // AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND // other lines not connected @@ -650,8 +638,8 @@ ROM_START( z80netf ) ROM_LOAD( "ep2390.ic6", 0x14C00, 0x0400, CRC(28d28eee) SHA1(b80f75c1ac4905ae369ecbc9b9ce120cc85502ed) ) ROM_END -// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 1980, z80ne, 0, 0, z80ne, z80ne, z80ne_state, init_z80ne, "Nuova Elettronica", "Z80NE", MACHINE_NO_SOUND_HW) -COMP( 1980, z80net, z80ne, 0, z80net, z80net, z80ne_state, init_z80net, "Nuova Elettronica", "Z80NE + LX.388", MACHINE_NO_SOUND_HW) -COMP( 1980, z80netb, z80ne, 0, z80netb, z80net, z80ne_state, init_z80netb, "Nuova Elettronica", "Z80NE + LX.388 + Basic 16k", MACHINE_NO_SOUND_HW) -COMP( 1980, z80netf, z80ne, 0, z80netf, z80netf, z80netf_state, init_z80netf, "Nuova Elettronica", "Z80NE + LX.388 + LX.390", MACHINE_NO_SOUND_HW) +// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS +COMP( 1980, z80ne, 0, 0, z80ne, z80ne, z80ne_state, empty_init, "Nuova Elettronica", "Z80NE", MACHINE_NO_SOUND_HW) +COMP( 1980, z80net, z80ne, 0, z80net, z80net, z80net_state, empty_init, "Nuova Elettronica", "Z80NE + LX.388", MACHINE_NO_SOUND_HW) +COMP( 1980, z80netb, z80ne, 0, z80netb, z80net, z80netb_state, empty_init, "Nuova Elettronica", "Z80NE + LX.388 + Basic 16k", MACHINE_NO_SOUND_HW) +COMP( 1980, z80netf, z80ne, 0, z80netf, z80netf, z80netf_state, empty_init, "Nuova Elettronica", "Z80NE + LX.388 + LX.390", MACHINE_NO_SOUND_HW) diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h index 2a640832a3d..a11a71b707a 100644 --- a/src/mame/includes/z80ne.h +++ b/src/mame/includes/z80ne.h @@ -67,11 +67,8 @@ class z80ne_state : public driver_device public: z80ne_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_vdg(*this, "mc6847"), - m_videoram(*this, "videoram"), m_uart(*this, "uart"), m_uart_clock(*this, "uart_clock"), - m_lx387_kr2376(*this, "lx387_kr2376"), m_maincpu(*this, "z80ne"), m_cassette1(*this, "cassette"), m_cassette2(*this, "cassette2"), @@ -86,34 +83,25 @@ public: m_io_ctrl(*this, "CTRL"), m_io_rst(*this, "RST"), m_io_lx_385(*this, "LX.385"), - m_io_lx387_brk(*this, "LX387_BRK"), - m_io_modifiers(*this, "MODIFIERS"), m_lx383_digits(*this, "digit%u", 0U) { } - void lx387(machine_config &config); - void z80net(machine_config &config); void z80ne(machine_config &config); - void z80netb(machine_config &config); - - void init_z80net(); - void init_z80netb(); - void init_z80ne(); DECLARE_INPUT_CHANGED_MEMBER(z80ne_reset); - DECLARE_INPUT_CHANGED_MEMBER(z80ne_nmi); - - DECLARE_READ8_MEMBER(lx388_mc6847_videoram_r); protected: + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void driver_init() override; + + void base_reset(); + DECLARE_FLOPPY_FORMATS(floppy_formats); - optional_device m_vdg; - optional_shared_ptr m_videoram; required_device m_uart; required_device m_uart_clock; - optional_device m_lx387_kr2376; uint8_t m_lx383_scan_counter; uint8_t m_lx383_key[LX383_KEYS]; int m_lx383_downsampler; @@ -121,32 +109,16 @@ protected: emu_timer *m_cassette_timer; emu_timer *m_kbd_timer; z80ne_cass_data_t m_cass_data; + DECLARE_READ8_MEMBER(lx383_r); DECLARE_WRITE8_MEMBER(lx383_w); DECLARE_READ8_MEMBER(lx385_ctrl_r); DECLARE_WRITE8_MEMBER(lx385_ctrl_w); DECLARE_WRITE_LINE_MEMBER(lx385_uart_tx_clock_w); - DECLARE_READ_LINE_MEMBER(lx387_shift_r); - DECLARE_READ_LINE_MEMBER(lx387_control_r); - DECLARE_READ8_MEMBER(lx387_data_r); - DECLARE_READ8_MEMBER(lx388_read_field_sync); - DECLARE_MACHINE_START(z80ne); - DECLARE_MACHINE_RESET(z80ne); - DECLARE_MACHINE_START(z80netb); - DECLARE_MACHINE_RESET(z80netb); - DECLARE_MACHINE_START(z80net); - DECLARE_MACHINE_RESET(z80net); - DECLARE_MACHINE_RESET(z80ne_base); TIMER_CALLBACK_MEMBER(z80ne_cassette_tc); TIMER_CALLBACK_MEMBER(z80ne_kbd_scan); - void z80ne_io(address_map &map); - void z80ne_mem(address_map &map); - void z80net_io(address_map &map); - void z80net_mem(address_map &map); - void z80netb_mem(address_map &map); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; required_device m_maincpu; @@ -163,23 +135,83 @@ protected: required_ioport m_io_ctrl; required_ioport m_io_rst; required_ioport m_io_lx_385; - optional_ioport m_io_lx387_brk; - optional_ioport m_io_modifiers; output_finder<8> m_lx383_digits; emu_timer *m_timer_nmi; emu_timer *m_timer_reset; cassette_image_device *cassette_device_image(); - void reset_lx387(); void reset_lx382_banking(); + +private: + void main_mem(address_map &map); + void main_io(address_map &map); }; -class z80netf_state : public z80ne_state +class z80net_state : public z80ne_state +{ +public: + z80net_state(const machine_config &mconfig, device_type type, const char *tag) + : z80ne_state(mconfig, type, tag), + m_videoram(*this, "videoram"), + m_vdg(*this, "mc6847"), + m_lx387_kr2376(*this, "lx387_kr2376"), + m_io_lx387_brk(*this, "LX387_BRK"), + m_io_modifiers(*this, "MODIFIERS") + { + } + + void lx387(machine_config &config); + void z80net(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(z80net_nmi); + +protected: + virtual void machine_reset() override; + virtual void driver_init() override; + + DECLARE_READ_LINE_MEMBER(lx387_shift_r); + DECLARE_READ_LINE_MEMBER(lx387_control_r); + DECLARE_READ8_MEMBER(lx387_data_r); + DECLARE_READ8_MEMBER(lx388_mc6847_videoram_r); + DECLARE_READ8_MEMBER(lx388_read_field_sync); + + required_shared_ptr m_videoram; + required_device m_vdg; + required_device m_lx387_kr2376; + required_ioport m_io_lx387_brk; + required_ioport m_io_modifiers; + + void reset_lx387(); + + void main_io(address_map &map); + +private: + void main_mem(address_map &map); +}; + +class z80netb_state : public z80net_state +{ +public: + z80netb_state(const machine_config &mconfig, device_type type, const char *tag) + : z80net_state(mconfig, type, tag) + { + } + + void z80netb(machine_config &config); + +protected: + virtual void machine_reset() override; + +private: + void main_mem(address_map &map); +}; + +class z80netf_state : public z80netb_state { public: z80netf_state(const machine_config &mconfig, device_type type, const char *tag) - : z80ne_state(mconfig, type, tag), + : z80netb_state(mconfig, type, tag), m_io_config(*this, "CONFIG"), m_floppy(*this, "wd1771:%u", 0U), m_wd1771(*this, "wd1771"), @@ -189,9 +221,11 @@ public: void z80netf(machine_config &config); - void init_z80netf(); - private: + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void driver_init() override; + struct wd17xx_state_t { int drq; @@ -200,11 +234,8 @@ private: uint8_t head; /* current head */ }; - void z80netf_io(address_map &map); - void z80netf_mem(address_map &map); - - DECLARE_MACHINE_START(z80netf); - DECLARE_MACHINE_RESET(z80netf); + void main_mem(address_map &map); + void main_io(address_map &map); DECLARE_WRITE8_MEMBER(lx390_motor_w); DECLARE_READ8_MEMBER(lx390_reset_bank); diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp index c9e1677e667..aefb0b7dc44 100644 --- a/src/mame/machine/z80ne.cpp +++ b/src/mame/machine/z80ne.cpp @@ -66,7 +66,7 @@ TIMER_CALLBACK_MEMBER(z80ne_state::z80ne_cassette_tc) } -void z80ne_state::init_z80ne() +void z80ne_state::driver_init() { /* first two entries point to rom on reset */ uint8_t *RAM = m_region_z80ne->base(); @@ -75,16 +75,12 @@ void z80ne_state::init_z80ne() m_bank2->configure_entry(0, &RAM[0x14000]); /* ep382 at 0x8000 */ } -void z80ne_state::init_z80net() +void z80net_state::driver_init() { - init_z80ne(); + z80ne_state::driver_init(); } -void z80ne_state::init_z80netb() -{ -} - -void z80netf_state::init_z80netf() +void z80netf_state::driver_init() { /* first two entries point to rom on reset */ uint8_t *RAM = m_region_z80ne->base(); @@ -162,7 +158,7 @@ void z80ne_state::device_timer(emu_timer &timer, device_timer_id id, int param, } } -void z80ne_state::reset_lx387() +void z80net_state::reset_lx387() { m_lx387_kr2376->set_input_pin( kr2376_device::KR2376_DSII, 0); m_lx387_kr2376->set_input_pin( kr2376_device::KR2376_PII, 0); @@ -231,13 +227,9 @@ void z80netf_state::reset_lx390_banking() */ } -MACHINE_RESET_MEMBER(z80ne_state,z80ne_base) +void z80ne_state::base_reset() { - int i; - - LOG("In machine_reset z80ne_base\n"); - - for ( i=0; iread(); @@ -333,10 +321,8 @@ INPUT_CHANGED_MEMBER(z80ne_state::z80ne_nmi) } } -MACHINE_START_MEMBER(z80ne_state,z80ne) +void z80ne_state::machine_start() { - LOG("In MACHINE_START z80ne\n"); - m_timer_nmi = timer_alloc(0); m_timer_reset = timer_alloc(1); @@ -351,23 +337,9 @@ MACHINE_START_MEMBER(z80ne_state,z80ne) m_kbd_timer->adjust(attotime::from_hz(1000), 0, attotime::from_hz(1000)); } -MACHINE_START_MEMBER(z80ne_state,z80net) +void z80netf_state::machine_start() { - MACHINE_START_CALL_MEMBER( z80ne ); - LOG("In MACHINE_START z80net\n"); -} - -MACHINE_START_MEMBER(z80ne_state,z80netb) -{ - MACHINE_START_CALL_MEMBER( z80net ); - LOG("In MACHINE_START z80netb\n"); -} - -MACHINE_START_MEMBER(z80netf_state,z80netf) -{ - MACHINE_START_CALL_MEMBER( z80net ); - LOG("In MACHINE_START z80netf\n"); - + z80ne_state::machine_start(); m_drv_led.resolve(); } @@ -557,41 +529,38 @@ WRITE_LINE_MEMBER(z80ne_state::lx385_uart_tx_clock_w) m_uart->write_tcp(state); } -READ_LINE_MEMBER(z80ne_state::lx387_shift_r) +READ_LINE_MEMBER(z80net_state::lx387_shift_r) { return BIT(m_io_modifiers->read(), 0) || BIT(m_io_modifiers->read(), 2); } -READ_LINE_MEMBER(z80ne_state::lx387_control_r) +READ_LINE_MEMBER(z80net_state::lx387_control_r) { return BIT(m_io_modifiers->read(), 1); } -READ8_MEMBER(z80ne_state::lx388_mc6847_videoram_r) +READ8_MEMBER(z80net_state::lx388_mc6847_videoram_r) { if (offset == ~0) return 0xff; - uint8_t *videoram = m_videoram; - int d6 = BIT(videoram[offset], 6); - int d7 = BIT(videoram[offset], 7); + int d6 = BIT(m_videoram[offset], 6); + int d7 = BIT(m_videoram[offset], 7); m_vdg->inv_w(d6 && d7); m_vdg->as_w(!d6 && d7); m_vdg->intext_w(!d6 && d7); - return videoram[offset]; + return m_videoram[offset]; } -READ8_MEMBER(z80ne_state::lx387_data_r) +READ8_MEMBER(z80net_state::lx387_data_r) { - uint8_t data; - - data = m_lx387_kr2376->data_r(space, 0) & 0x7f; + uint8_t data = m_lx387_kr2376->data_r(space, 0) & 0x7f; data |= m_lx387_kr2376->get_output_pin(kr2376_device::KR2376_SO) << 7; return data; } -READ8_MEMBER(z80ne_state::lx388_read_field_sync) +READ8_MEMBER(z80net_state::lx388_read_field_sync) { return m_vdg->fs_r() << 7; }