diff --git a/src/mess/drivers/ac1.c b/src/mess/drivers/ac1.c index 46683958e08..bf67bbfff9e 100644 --- a/src/mess/drivers/ac1.c +++ b/src/mess/drivers/ac1.c @@ -53,7 +53,7 @@ ADDRESS_MAP_END /* Input ports */ static INPUT_PORTS_START( ac1 ) - PORT_START("LINE0") + PORT_START("LINE.0") PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"') @@ -63,7 +63,7 @@ static INPUT_PORTS_START( ac1 ) PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') - PORT_START("LINE1") + PORT_START("LINE.1") PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('*') @@ -73,7 +73,7 @@ static INPUT_PORTS_START( ac1 ) PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('>') PORT_CHAR('.') PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('?') PORT_CHAR('/') - PORT_START("LINE2") + PORT_START("LINE.2") PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('@') PORT_CHAR('`') PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a') PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b') @@ -83,7 +83,7 @@ static INPUT_PORTS_START( ac1 ) PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHAR('f') PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g') - PORT_START("LINE3") + PORT_START("LINE.3") PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('h') PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i') PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j') @@ -93,7 +93,7 @@ static INPUT_PORTS_START( ac1 ) PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n') PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHAR('o') - PORT_START("LINE4") + PORT_START("LINE.4") PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p') PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q') PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r') @@ -103,7 +103,7 @@ static INPUT_PORTS_START( ac1 ) PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR('v') PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHAR('w') - PORT_START("LINE5") + PORT_START("LINE.5") PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x') PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y') PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z') @@ -113,7 +113,7 @@ static INPUT_PORTS_START( ac1 ) PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) - PORT_START("LINE6") + PORT_START("LINE.6") 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_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') diff --git a/src/mess/includes/ac1.h b/src/mess/includes/ac1.h index dff44d07d6b..b18cad87b24 100644 --- a/src/mess/includes/ac1.h +++ b/src/mess/includes/ac1.h @@ -20,9 +20,10 @@ public: m_cassette(*this, "cassette"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette"), + m_io_line(*this, "LINE") + { } - required_device m_cassette; DECLARE_DRIVER_INIT(ac1); virtual void machine_reset(); virtual void video_start(); @@ -32,9 +33,13 @@ public: DECLARE_READ8_MEMBER(ac1_port_a_r); DECLARE_WRITE8_MEMBER(ac1_port_a_w); DECLARE_WRITE8_MEMBER(ac1_port_b_w); + +private: + required_device m_cassette; required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; + required_ioport_array<7> m_io_line; }; /*----------- defined in video/ac1.c -----------*/ diff --git a/src/mess/machine/ac1.c b/src/mess/machine/ac1.c index faa1411b57f..e504807ef96 100644 --- a/src/mess/machine/ac1.c +++ b/src/mess/machine/ac1.c @@ -27,13 +27,13 @@ READ8_MEMBER(ac1_state::ac1_port_b_r) READ8_MEMBER(ac1_state::ac1_port_a_r) { - UINT8 line0 = ioport("LINE0")->read(); - UINT8 line1 = ioport("LINE1")->read(); - UINT8 line2 = ioport("LINE2")->read(); - UINT8 line3 = ioport("LINE3")->read(); - UINT8 line4 = ioport("LINE4")->read(); - UINT8 line5 = ioport("LINE5")->read(); - UINT8 line6 = ioport("LINE6")->read(); + UINT8 line0 = m_io_line[0]->read(); + UINT8 line1 = m_io_line[1]->read(); + UINT8 line2 = m_io_line[2]->read(); + UINT8 line3 = m_io_line[3]->read(); + UINT8 line4 = m_io_line[4]->read(); + UINT8 line5 = m_io_line[5]->read(); + UINT8 line6 = m_io_line[6]->read(); UINT8 SH = BNOT(BIT(line6,0)); UINT8 CTRL = BNOT(BIT(line6,1));