diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c index f39f9d226c0..7aabe92e5af 100644 --- a/src/mame/drivers/arcadecl.c +++ b/src/mame/drivers/arcadecl.c @@ -176,14 +176,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x3e0000, 0x3e07ff) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3e0800, 0x3effbf) AM_RAM AM_RANGE(0x3effc0, 0x3effff) AM_RAM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) - AM_RANGE(0x640000, 0x640001) AM_READ(input_port_0_word_r) - AM_RANGE(0x640002, 0x640003) AM_READ(input_port_1_word_r) - AM_RANGE(0x640010, 0x640011) AM_READ(input_port_2_word_r) - AM_RANGE(0x640012, 0x640013) AM_READ(input_port_3_word_r) - AM_RANGE(0x640020, 0x640021) AM_READ(input_port_4_word_r) - AM_RANGE(0x640022, 0x640023) AM_READ(input_port_5_word_r) - AM_RANGE(0x640024, 0x640025) AM_READ(input_port_6_word_r) - AM_RANGE(0x640026, 0x640027) AM_READ(input_port_7_word_r) + AM_RANGE(0x640000, 0x640001) AM_READ_PORT("PLAYER1") + AM_RANGE(0x640002, 0x640003) AM_READ_PORT("PLAYER2") + AM_RANGE(0x640010, 0x640011) AM_READ_PORT("STATUS") + AM_RANGE(0x640012, 0x640013) AM_READ_PORT("COIN") + AM_RANGE(0x640020, 0x640021) AM_READ_PORT("TRACKX2") + AM_RANGE(0x640022, 0x640023) AM_READ_PORT("TRACKY2") + AM_RANGE(0x640024, 0x640025) AM_READ_PORT("TRACKX1") + AM_RANGE(0x640026, 0x640027) AM_READ_PORT("TRACKY1") AM_RANGE(0x640040, 0x64004f) AM_WRITE(latch_w) AM_RANGE(0x640060, 0x64006f) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x641000, 0x641fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size) @@ -201,7 +201,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( arcadecl ) - PORT_START_TAG("640000") + PORT_START_TAG("PLAYER1") PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) @@ -209,7 +209,7 @@ static INPUT_PORTS_START( arcadecl ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640002") + PORT_START_TAG("PLAYER2") PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) @@ -217,7 +217,7 @@ static INPUT_PORTS_START( arcadecl ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640010") + PORT_START_TAG("STATUS") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -228,34 +228,34 @@ static INPUT_PORTS_START( arcadecl ) PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640012") + PORT_START_TAG("COIN") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640020") - PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(32) PORT_CODE_DEC(KEYCODE_UP) PORT_CODE_INC(KEYCODE_DOWN) PORT_REVERSE PORT_PLAYER(2) + PORT_START_TAG("TRACKX2") + PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(2) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640022") + PORT_START_TAG("TRACKY2") PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(32) PORT_PLAYER(2) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640024") + PORT_START_TAG("TRACKX1") PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640026") + PORT_START_TAG("TRACKY1") PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(32) PORT_PLAYER(1) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( sparkz ) - PORT_START_TAG("640000") + PORT_START_TAG("PLAYER1") PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) @@ -266,7 +266,7 @@ static INPUT_PORTS_START( sparkz ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) - PORT_START_TAG("640002") + PORT_START_TAG("PLAYER2") PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) @@ -277,7 +277,7 @@ static INPUT_PORTS_START( sparkz ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) - PORT_START_TAG("640010") + PORT_START_TAG("STATUS") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -288,24 +288,24 @@ static INPUT_PORTS_START( sparkz ) PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640012") + PORT_START_TAG("COIN") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* not in "test mode" */ PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640020") + PORT_START_TAG("TRACKX2") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640022") + PORT_START_TAG("TRACKY2") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640024") + PORT_START_TAG("TRACKX1") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("640026") + PORT_START_TAG("TRACKY1") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END