diff options
Diffstat (limited to 'src/mess/drivers/crvision.c')
-rw-r--r-- | src/mess/drivers/crvision.c | 175 |
1 files changed, 73 insertions, 102 deletions
diff --git a/src/mess/drivers/crvision.c b/src/mess/drivers/crvision.c index 27be2f8a65b..08250767a2e 100644 --- a/src/mess/drivers/crvision.c +++ b/src/mess/drivers/crvision.c @@ -190,39 +190,39 @@ INPUT_CHANGED_MEMBER( crvision_state::trigger_nmi ) static INPUT_PORTS_START( crvision ) // Player 1 Joystick - PORT_START("PA0-0") + PORT_START("PA0.0") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA0-1") + PORT_START("PA0.1") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_BIT( 0xfd, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA0-2") + PORT_START("PA0.2") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_BIT( 0xf3, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA0-3") + PORT_START("PA0.3") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_BIT( 0xf7, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA0-4") + PORT_START("PA0.4") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA0-5") + PORT_START("PA0.5") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_BIT( 0xdf, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA0-6") + PORT_START("PA0.6") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA0-7") + PORT_START("PA0.7") PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Button 2 / CNT'L") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) // Player 1 Keyboard - PORT_START("PA1-0") + PORT_START("PA1.0") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(UTF8_LEFT) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) @@ -231,7 +231,7 @@ static INPUT_PORTS_START( crvision ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_BIT( 0x81, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA1-1") + PORT_START("PA1.1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X') @@ -239,70 +239,70 @@ static INPUT_PORTS_START( crvision ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_BIT( 0x83, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA1-2") + PORT_START("PA1.2") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_BIT( 0x87, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA1-3") + PORT_START("PA1.3") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$') PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%') PORT_BIT( 0x8f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA1-4") + PORT_START("PA1.4") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"') PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&') PORT_BIT( 0x9f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA1-5") + PORT_START("PA1.5") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#') PORT_BIT( 0xbf, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA1-6") + PORT_START("PA1.6") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA1-7") + PORT_START("PA1.7") PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Button 1 / SHIFT") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) // Player 2 Joystick - PORT_START("PA2-0") + PORT_START("PA2.0") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA2-1") + PORT_START("PA2.1") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_CODE(KEYCODE_2_PAD) PORT_BIT( 0xfd, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA2-2") + PORT_START("PA2.2") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_CODE(KEYCODE_6_PAD) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("SPACE") PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') PORT_BIT( 0xf3, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA2-3") + PORT_START("PA2.3") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_CODE(KEYCODE_8_PAD) PORT_BIT( 0xf7, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA2-4") + PORT_START("PA2.4") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA2-5") + PORT_START("PA2.5") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_CODE(KEYCODE_4_PAD) PORT_BIT( 0xdf, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA2-6") + PORT_START("PA2.6") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA2-7") + PORT_START("PA2.7") PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Button 2 / \xE2\x86\x92") PORT_CODE(KEYCODE_TAB) PORT_CHAR(9) PORT_PLAYER(2) // Player 2 Keyboard - PORT_START("PA3-0") + PORT_START("PA3.0") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("RET'N") PORT_CODE(KEYCODE_ENTER) PORT_CHAR('\r') @@ -311,7 +311,7 @@ static INPUT_PORTS_START( crvision ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_BIT( 0x81, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA3-1") + PORT_START("PA3.1") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') 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_0) PORT_CHAR('0') PORT_CHAR('@') @@ -319,32 +319,32 @@ static INPUT_PORTS_START( crvision ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') PORT_BIT( 0x83, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA3-2") + PORT_START("PA3.2") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_BIT( 0x87, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA3-3") + PORT_START("PA3.3") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(';') PORT_CHAR('+') PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_BIT( 0x8f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA3-4") + PORT_START("PA3.4") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_BIT( 0x9f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA3-5") + PORT_START("PA3.5") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') PORT_BIT( 0xbf, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA3-6") + PORT_START("PA3.6") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("PA3-7") + PORT_START("PA3.7") PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Button 1 / - =") PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=') PORT_PLAYER(2) @@ -357,7 +357,7 @@ INPUT_PORTS_END -------------------------------------------------*/ static INPUT_PORTS_START( manager ) - PORT_START("Y0") + PORT_START("Y.0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>') @@ -367,7 +367,7 @@ static INPUT_PORTS_START( manager ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s') PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x') - PORT_START("Y1") + PORT_START("Y.1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xC3\x84 \xC3\xA4") PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(0x00C4) PORT_CHAR(0x00E4) @@ -377,7 +377,7 @@ static INPUT_PORTS_START( manager ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a') PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z') - PORT_START("Y2") + PORT_START("Y.2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i') PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?') @@ -387,7 +387,7 @@ static INPUT_PORTS_START( manager ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("CTRL") PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_MAMEKEY(LCONTROL)) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("SHIFT") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) - PORT_START("Y3") + PORT_START("Y.3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n') PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x') PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xC3\x96 \xC3\xB6") PORT_CODE(KEYCODE_COLON) PORT_CHAR(0x00D6) PORT_CHAR(0x00F6) @@ -397,7 +397,7 @@ static INPUT_PORTS_START( manager ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d') PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c') - PORT_START("Y4") + PORT_START("Y.4") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<') @@ -407,7 +407,7 @@ static INPUT_PORTS_START( manager ) 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_V) PORT_CHAR('V') PORT_CHAR('v') - PORT_START("Y5") + PORT_START("Y.5") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j') PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l') @@ -417,7 +417,7 @@ static INPUT_PORTS_START( manager ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g') PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b') - PORT_START("Y6") + PORT_START("Y.6") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s') PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHAR('k') @@ -427,7 +427,7 @@ static INPUT_PORTS_START( manager ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('h') PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n') - PORT_START("Y7") + PORT_START("Y.7") 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_N) PORT_CHAR('N') PORT_CHAR('n') PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') @@ -437,7 +437,7 @@ static INPUT_PORTS_START( manager ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j') PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR('m') - PORT_START("JOY0") + PORT_START("JOY.0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) @@ -447,11 +447,11 @@ static INPUT_PORTS_START( manager ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_START("JOY1") + PORT_START("JOY.1") PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_START("JOY2") + PORT_START("JOY.2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) @@ -461,7 +461,7 @@ static INPUT_PORTS_START( manager ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_START("JOY3") + PORT_START("JOY.3") PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) INPUT_PORTS_END @@ -497,19 +497,17 @@ WRITE8_MEMBER( crvision_state::pia_pa_w ) UINT8 crvision_state::read_keyboard(int pa) { - int i; - UINT8 value; - static const char *const keynames[4][8] = - { - { "PA0-0", "PA0-1", "PA0-2", "PA0-3", "PA0-4", "PA0-5", "PA0-6", "PA0-7" }, - { "PA1-0", "PA1-1", "PA1-2", "PA1-3", "PA1-4", "PA1-5", "PA1-6", "PA1-7" }, - { "PA2-0", "PA2-1", "PA2-2", "PA2-3", "PA2-4", "PA2-5", "PA2-6", "PA2-7" }, - { "PA3-0", "PA3-1", "PA3-2", "PA3-3", "PA3-4", "PA3-5", "PA3-6", "PA3-7" } - }; - - for (i = 0; i < 8; i++) + UINT8 value = 0; + + for (int i = 0; i < 8; i++) { - value = ioport(keynames[pa][i])->read(); + switch (pa & 3) + { + case 0: value = m_inp_pa0[i]->read(); break; + case 1: value = m_inp_pa1[i]->read(); break; + case 2: value = m_inp_pa2[i]->read(); break; + case 3: value = m_inp_pa3[i]->read(); break; + } if (value != 0xff) { @@ -560,10 +558,9 @@ READ8_MEMBER( crvision_state::pia_pb_r ) UINT8 data = 0xff; - if (BIT(m_keylatch, 0)) data &= read_keyboard(0); - if (BIT(m_keylatch, 1)) data &= read_keyboard(1); - if (BIT(m_keylatch, 2)) data &= read_keyboard(2); - if (BIT(m_keylatch, 3)) data &= read_keyboard(3); + for (int i = 0; i < 4; i++) + if (m_keylatch >> i & 1) + data &= read_keyboard(i); return data; } @@ -585,14 +582,9 @@ READ8_MEMBER( laser2001_state::pia_pa_r ) UINT8 data = 0xff; - if (!BIT(m_keylatch, 0)) data &= m_y0->read(); - if (!BIT(m_keylatch, 1)) data &= m_y1->read(); - if (!BIT(m_keylatch, 2)) data &= m_y2->read(); - if (!BIT(m_keylatch, 3)) data &= m_y3->read(); - if (!BIT(m_keylatch, 4)) data &= m_y4->read(); - if (!BIT(m_keylatch, 5)) data &= m_y5->read(); - if (!BIT(m_keylatch, 6)) data &= m_y6->read(); - if (!BIT(m_keylatch, 7)) data &= m_y7->read(); + for (int i = 0; i < 8; i++) + if (~m_keylatch >> i & 1) + data &= m_inp_y[i]->read(); return data; } @@ -617,10 +609,9 @@ READ8_MEMBER( laser2001_state::pia_pb_r ) { UINT8 data = 0xff; - if (!BIT(m_joylatch, 0)) data &= m_joy0->read(); - if (!BIT(m_joylatch, 1)) data &= m_joy1->read(); - if (!BIT(m_joylatch, 2)) data &= m_joy2->read(); - if (!BIT(m_joylatch, 3)) data &= m_joy3->read(); + for (int i = 0; i < 4; i++) + if (~m_joylatch >> i & 1) + data &= m_inp_joy[i]->read(); return data; } @@ -692,15 +683,11 @@ WRITE_LINE_MEMBER( laser2001_state::pia_cb2_w ) MACHINE INITIALIZATION ***************************************************************************/ -/*------------------------------------------------- - MACHINE_START( creativision ) --------------------------------------------------*/ - void crvision_state::machine_start() { - // state saving + // zerofill/state saving + m_keylatch = 0; save_item(NAME(m_keylatch)); - save_item(NAME(m_joylatch)); if (m_cart->exists()) { @@ -709,34 +696,18 @@ void crvision_state::machine_start() } } -void crvision_pal_state::machine_start() +void laser2001_state::machine_start() { - // state saving - save_item(NAME(m_keylatch)); - save_item(NAME(m_joylatch)); - - if (m_cart->exists()) - { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x7fff, read8_delegate(FUNC(crvision_cart_slot_device::read_rom40),(crvision_cart_slot_device*)m_cart)); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8_delegate(FUNC(crvision_cart_slot_device::read_rom80),(crvision_cart_slot_device*)m_cart)); - } -} + crvision_state::machine_start(); -/*------------------------------------------------- - MACHINE_START( lasr2001 ) --------------------------------------------------*/ + // zerofill/state saving + m_joylatch = 0; + m_centronics_busy = 0; + m_psg_ready = 0; -void laser2001_state::machine_start() -{ - // state saving - save_item(NAME(m_keylatch)); save_item(NAME(m_joylatch)); - - if (m_cart->exists()) - { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x7fff, read8_delegate(FUNC(crvision_cart_slot_device::read_rom40),(crvision_cart_slot_device*)m_cart)); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8_delegate(FUNC(crvision_cart_slot_device::read_rom80),(crvision_cart_slot_device*)m_cart)); - } + save_item(NAME(m_centronics_busy)); + save_item(NAME(m_psg_ready)); } |