Skip to content

Commit

Permalink
mephisto_amsterdam/glasgow: keypad was swapped around wrong
Browse files Browse the repository at this point in the history
  • Loading branch information
@happppp
happppp committed Jul 22, 2021
1 parent 25fcada commit e76c745
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 52 deletions.
20 changes: 10 additions & 10 deletions src/mame/drivers/mephisto_amsterdam.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,6 @@ void amsterdam_state::dallas32_mem(address_map &map)

static INPUT_PORTS_START( amsterdam )
PORT_START("KEY.0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("A / 1") PORT_CODE(KEYCODE_A) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("B / 2 / Pawn") PORT_CODE(KEYCODE_B) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("C / 3 / Knight") PORT_CODE(KEYCODE_C) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("D / 4 / Bishop") PORT_CODE(KEYCODE_D) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("E / 5 / Rook") PORT_CODE(KEYCODE_E) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("F / 6 / Queen") PORT_CODE(KEYCODE_F) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Left / Black / 9") PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_CODE(KEYCODE_LEFT)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Right / White / 0") PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_CODE(KEYCODE_RIGHT)

PORT_START("KEY.1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("INFO") PORT_CODE(KEYCODE_I)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("POS") PORT_CODE(KEYCODE_O)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("LEV") PORT_CODE(KEYCODE_L)
Expand All @@ -169,6 +159,16 @@ static INPUT_PORTS_START( amsterdam )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("G / 7 / King") PORT_CODE(KEYCODE_G) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_7_PAD)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("H / 8") PORT_CODE(KEYCODE_H) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD)

PORT_START("KEY.1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("A / 1") PORT_CODE(KEYCODE_A) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("B / 2 / Pawn") PORT_CODE(KEYCODE_B) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("C / 3 / Knight") PORT_CODE(KEYCODE_C) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("D / 4 / Bishop") PORT_CODE(KEYCODE_D) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("E / 5 / Rook") PORT_CODE(KEYCODE_E) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("F / 6 / Queen") PORT_CODE(KEYCODE_F) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Left / Black / 9") PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_CODE(KEYCODE_LEFT)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Right / White / 0") PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_CODE(KEYCODE_RIGHT)

PORT_START("RESET")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("RES 1") PORT_CODE(KEYCODE_Z) PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF, amsterdam_state, reset_button, 0)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("RES 2") PORT_CODE(KEYCODE_X) PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF, amsterdam_state, reset_button, 0)
Expand Down
20 changes: 10 additions & 10 deletions src/mame/drivers/mephisto_glasgow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,16 +148,6 @@ void glasgow_state::glasgow_mem(address_map &map)

static INPUT_PORTS_START( glasgow )
PORT_START("KEY.0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Left / Black / 9") PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_CODE(KEYCODE_LEFT)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CL") PORT_CODE(KEYCODE_BACKSPACE) PORT_CODE(KEYCODE_DEL)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("C / 3 / Knight") PORT_CODE(KEYCODE_C) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("ENT") PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("D / 4 / Bishop") PORT_CODE(KEYCODE_D) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("A / 1") PORT_CODE(KEYCODE_A) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("F / 6 / Queen") PORT_CODE(KEYCODE_F) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("B / 2 / Pawn") PORT_CODE(KEYCODE_B) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD)

PORT_START("KEY.1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("E / 5 / Rook") PORT_CODE(KEYCODE_E) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("INFO") PORT_CODE(KEYCODE_I)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Right / White / 0") PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_CODE(KEYCODE_RIGHT)
Expand All @@ -166,6 +156,16 @@ static INPUT_PORTS_START( glasgow )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("LEV") PORT_CODE(KEYCODE_L)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("G / 7 / King") PORT_CODE(KEYCODE_G) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_7_PAD)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("MEM") PORT_CODE(KEYCODE_M)

PORT_START("KEY.1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Left / Black / 9") PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_CODE(KEYCODE_LEFT)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CL") PORT_CODE(KEYCODE_BACKSPACE) PORT_CODE(KEYCODE_DEL)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("C / 3 / Knight") PORT_CODE(KEYCODE_C) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("ENT") PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("D / 4 / Bishop") PORT_CODE(KEYCODE_D) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("A / 1") PORT_CODE(KEYCODE_A) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("F / 6 / Queen") PORT_CODE(KEYCODE_F) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("B / 2 / Pawn") PORT_CODE(KEYCODE_B) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD)
INPUT_PORTS_END


Expand Down
32 changes: 16 additions & 16 deletions src/mame/layout/mephisto_amsterdam.lay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,41 +493,41 @@ license:CC0
<element ref="gray"><bounds x="89.7" y="105.3" width="0.9" height="0.9" /></element>
<element ref="white"><bounds x="94.5" y="105.1" width="1.3" height="1.3" /></element>

<element ref="keys" inputtag="KEY.1" inputmask="0x01"> <!-- INFO -->
<element ref="keys" inputtag="KEY.0" inputmask="0x01"> <!-- INFO -->
<bounds x="69" y="93" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x02"> <!-- POS -->
<element ref="keys" inputtag="KEY.0" inputmask="0x02"> <!-- POS -->
<bounds x="74" y="93" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x04"> <!-- LEV -->
<element ref="keys" inputtag="KEY.0" inputmask="0x04"> <!-- LEV -->
<bounds x="79" y="93" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x08"> <!-- MEM -->
<element ref="keys" inputtag="KEY.0" inputmask="0x08"> <!-- MEM -->
<bounds x="84" y="93" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x10"> <!-- CL -->
<element ref="keys" inputtag="KEY.0" inputmask="0x10"> <!-- CL -->
<bounds x="89" y="93" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x20"> <!-- ENT -->
<element ref="keys" inputtag="KEY.0" inputmask="0x20"> <!-- ENT -->
<bounds x="94" y="93" width="4" height="4" /><color alpha="0.25" />
</element>

<element ref="keys" inputtag="KEY.0" inputmask="0x01"> <!-- A1 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x01"> <!-- A1 -->
<bounds x="69" y="98" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x02"> <!-- B2 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x02"> <!-- B2 -->
<bounds x="74" y="98" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x04"> <!-- C3 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x04"> <!-- C3 -->
<bounds x="79" y="98" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x08"> <!-- D4 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x08"> <!-- D4 -->
<bounds x="84" y="98" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x10"> <!-- E5 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x10"> <!-- E5 -->
<bounds x="89" y="98" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x20"> <!-- F6 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x20"> <!-- F6 -->
<bounds x="94" y="98" width="4" height="4" /><color alpha="0.25" />
</element>

Expand All @@ -537,16 +537,16 @@ license:CC0
<element ref="keys" inputtag="RESET" inputmask="0x02"> <!-- RES -->
<bounds x="74" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x40"> <!-- G7 -->
<element ref="keys" inputtag="KEY.0" inputmask="0x40"> <!-- G7 -->
<bounds x="79" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x80"> <!-- H8 -->
<element ref="keys" inputtag="KEY.0" inputmask="0x80"> <!-- H8 -->
<bounds x="84" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x40"> <!-- 9 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x40"> <!-- 9 -->
<bounds x="89" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x80"> <!-- 0 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x80"> <!-- 0 -->
<bounds x="94" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
</group>
Expand Down
32 changes: 16 additions & 16 deletions src/mame/layout/mephisto_glasgow.lay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,54 +491,54 @@ license:CC0
<element ref="gray"><bounds x="89.7" y="105.3" width="0.9" height="0.9" /></element>
<element ref="white"><bounds x="94.5" y="105.1" width="1.3" height="1.3" /></element>

<element ref="keys" inputtag="KEY.1" inputmask="0x02"> <!-- INFO -->
<element ref="keys" inputtag="KEY.0" inputmask="0x02"> <!-- INFO -->
<bounds x="69" y="93" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x08"> <!-- POS -->
<element ref="keys" inputtag="KEY.0" inputmask="0x08"> <!-- POS -->
<bounds x="74" y="93" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x20"> <!-- LEV -->
<element ref="keys" inputtag="KEY.0" inputmask="0x20"> <!-- LEV -->
<bounds x="79" y="93" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x80"> <!-- MEM -->
<element ref="keys" inputtag="KEY.0" inputmask="0x80"> <!-- MEM -->
<bounds x="84" y="93" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x02"> <!-- CL -->
<element ref="keys" inputtag="KEY.1" inputmask="0x02"> <!-- CL -->
<bounds x="89" y="93" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x08"> <!-- ENT -->
<element ref="keys" inputtag="KEY.1" inputmask="0x08"> <!-- ENT -->
<bounds x="94" y="93" width="4" height="4" /><color alpha="0.25" />
</element>

<element ref="keys" inputtag="KEY.0" inputmask="0x20"> <!-- A1 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x20"> <!-- A1 -->
<bounds x="69" y="98" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x80"> <!-- B2 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x80"> <!-- B2 -->
<bounds x="74" y="98" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x04"> <!-- C3 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x04"> <!-- C3 -->
<bounds x="79" y="98" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x10"> <!-- D4 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x10"> <!-- D4 -->
<bounds x="84" y="98" width="4" height="4" /><color alpha="0.25" />
</element>

<element ref="keys" inputtag="KEY.1" inputmask="0x01"> <!-- E5 -->
<element ref="keys" inputtag="KEY.0" inputmask="0x01"> <!-- E5 -->
<bounds x="69" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x40"> <!-- F6 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x40"> <!-- F6 -->
<bounds x="74" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x40"> <!-- G7 -->
<element ref="keys" inputtag="KEY.0" inputmask="0x40"> <!-- G7 -->
<bounds x="79" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x10"> <!-- H8 -->
<element ref="keys" inputtag="KEY.0" inputmask="0x10"> <!-- H8 -->
<bounds x="84" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.0" inputmask="0x01"> <!-- 9 -->
<element ref="keys" inputtag="KEY.1" inputmask="0x01"> <!-- 9 -->
<bounds x="89" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
<element ref="keys" inputtag="KEY.1" inputmask="0x04"> <!-- 0 -->
<element ref="keys" inputtag="KEY.0" inputmask="0x04"> <!-- 0 -->
<bounds x="94" y="103" width="4" height="4" /><color alpha="0.25" />
</element>
</group>
Expand Down

0 comments on commit e76c745

Please sign in to comment.