Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

complay: allow inputmask=0 when inputraw=1 for canceling input listener section (nw)

Browse Source
This commit is contained in:
hap 2019-08-24 12:19:42 +02:00
parent f5b2fd9ee6
commit 6a857daed7
11 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/build/complay.py
View File

@ -460,9 +460,6 @@ class LayoutChecker(Minifyer):
self.checkTag(attrs['inputtag'], name, 'inputtag')
elif 'inputmask' in attrs:
self.handleError('Element %s has inputmask attribute without inputtag attribute' % (name, ))
inputmask = self.checkIntAttribute(name, attrs, 'inputmask', None)
if (inputmask is not None) and (0 == inputmask):
self.handleError('Element %s has attribute inputmask "%s" is zero' % (name, attrs['inputmask']))
inputraw = self.checkIntAttribute(name, attrs, 'inputraw', None)
if (inputraw is not None):
if 'inputmask' not in attrs:
@ -471,6 +468,10 @@ class LayoutChecker(Minifyer):
self.handleError('Element %s has inputraw attribute without inputtag attribute' % (name, ))
if ((0 > inputraw) or (1 < inputraw)):
self.handleError('Element %s attribute inputraw "%s" not in valid range 0-1' % (name, attrs['inputraw']))
inputmask = self.checkIntAttribute(name, attrs, 'inputmask', None)
if (inputmask is not None) and (0 == inputmask):
if (inputraw is None) or (0 == inputraw):
self.handleError('Element %s has attribute inputmask "%s" is zero' % (name, attrs['inputmask']))
self.handlers.append((self.objectStartHandler, self.objectEndHandler))
self.have_bounds.append(False)
self.have_orientation.append(False)

3
src/mame/drivers/hh_pic16.cpp
View File

@ -763,9 +763,6 @@ static INPUT_PORTS_START( matchme )
PORT_CONFNAME( 0x02, 0x02, "Music" )
PORT_CONFSETTING( 0x02, "Manual" )
PORT_CONFSETTING( 0x00, "Auto" )
PORT_START("DUMMY")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END
void matchme_state::matchme(machine_config &config)

8
src/mame/drivers/hh_sm510.cpp
View File

@ -3560,7 +3560,7 @@ ROM_END
Nintendo Game & Watch: Donkey Kong Jr. (model CJ-93)
* PCB labels: CJ-93 M (main board), CJ-93C (controller board)
* Sharp SM511 label CJ-93 539D (no decap)
* lcd screen with custom segments, 1-bit sound
* inverted lcd screen with custom segments, 1-bit sound
This is the panorama version. There's also a tabletop version which is
assumed to use the same ROM/LCD, and a new wide screen version which is
@ -3643,7 +3643,7 @@ ROM_START( gnw_dkjrp )
ROM_LOAD( "cj-93.program", 0x0000, 0x1000, CRC(a2cd5a91) SHA1(33f6fd1530e5522491851f16d7c9f928b2dbdc3b) )
ROM_REGION( 0x100, "maincpu:melody", 0 )
ROM_LOAD( "cj-93.melody", 0x000, 0x100, BAD_DUMP CRC(99fbf76a) SHA1(15ba1af51bebc316146eb9a0a3d58d28f644d45f) )
ROM_LOAD( "cj-93.melody", 0x000, 0x100, BAD_DUMP CRC(99fbf76a) SHA1(15ba1af51bebc316146eb9a0a3d58d28f644d45f) ) // decap needed for verification
ROM_REGION( 340751, "screen", 0)
ROM_LOAD( "gnw_dkjrp.svg", 0, 340751, CRC(eb3cb98b) SHA1(5b148557d3ade2e2050ddde879a6cc05e119b446) )
@ -3658,7 +3658,7 @@ ROM_END
Nintendo Game & Watch: Mario's Bombs Away (model TB-94)
* PCB labels: TB-94 M (main board), SM-91C (controller board)
* Sharp SM511 label TB-94 537C (no decap)
* lcd screen with custom segments, 1-bit sound
* inverted lcd screen with custom segments, 1-bit sound
***************************************************************************/
@ -3731,7 +3731,7 @@ ROM_START( gnw_mbaway )
ROM_LOAD( "tb-94.program", 0x0000, 0x1000, CRC(11d18a48) SHA1(afccfa19dace7c4fcc15a84ecfcfb9d7ae3861e4) )
ROM_REGION( 0x100, "maincpu:melody", 0 )
ROM_LOAD( "tb-94.melody", 0x000, 0x100, BAD_DUMP CRC(6179e627) SHA1(e0bc8a7b2a1044f1437b0e06391102e403c11e1f) )
ROM_LOAD( "tb-94.melody", 0x000, 0x100, BAD_DUMP CRC(6179e627) SHA1(e0bc8a7b2a1044f1437b0e06391102e403c11e1f) ) // decap needed for verification
ROM_REGION( 514643, "screen", 0)
ROM_LOAD( "gnw_mbaway.svg", 0, 514643, CRC(2ec2f18b) SHA1(8e2fd20615d867aac97e443fb977513ff98138b4) )

12
src/mame/drivers/hh_tms1k.cpp
View File

@ -6992,9 +6992,6 @@ static INPUT_PORTS_START( simon )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, switch_next<0>, 0x07)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, switch_prev<3>, 0x0f)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, switch_next<3>, 0x0f)
PORT_START("DUMMY")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END
void simon_state::simon(machine_config &config)
@ -7162,9 +7159,6 @@ static INPUT_PORTS_START( ssimon )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, switch_next<4>, 0x0f)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, switch_prev<6>, 0x03)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, switch_next<6>, 0x03)
PORT_START("DUMMY")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END
void ssimon_state::ssimon(machine_config &config)
@ -8729,9 +8723,6 @@ static INPUT_PORTS_START( alphie )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, switch_next<2>, 0x1f) PORT_NAME("Answer Arm Down")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, switch_prev<3>, 0x0f) PORT_NAME("Activity Selector Left")
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, switch_next<3>, 0x0f) PORT_NAME("Activity Selector Right")
PORT_START("DUMMY")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END
// output PLA is guessed
@ -11300,9 +11291,6 @@ static INPUT_PORTS_START( copycat )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START ) PORT_NAME("Play")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Replay")
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_START("DUMMY")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END
void copycat_state::copycat(machine_config &config)

3
src/mame/drivers/saitek_ssystem3.cpp
View File

@ -253,9 +253,6 @@ static INPUT_PORTS_START( ssystem3 )
PORT_CONFNAME( 0x02, 0x02, "Light" )
PORT_CONFSETTING( 0x00, DEF_STR( Off ) )
PORT_CONFSETTING( 0x02, DEF_STR( On ) )
PORT_START("DUMMY")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END

2
src/mame/layout/alphie.lay
View File

@ -62,7 +62,7 @@
<bezel element="text_q"><bounds x="8" y="0" width="10" height="2" /></bezel>
<bezel element="text_ans"><bounds x="8" y="3" width="10" height="2" /></bezel>
<bezel element="text_act"><bounds x="8" y="6" width="10" height="2" /></bezel>
<bezel element="nothing" inputtag="DUMMY" inputmask="0x01"><bounds x="14" y="-1" width="4" height="10" /></bezel>
<bezel element="nothing" inputtag="IN.1" inputmask="0x00" inputraw="1"><bounds x="14" y="-1" width="4" height="10" /></bezel>
<bezel element="switch_qa" inputtag="IN.1" inputmask="0x1f" inputraw="1"><bounds x="15" y="0" width="2" height="2" /></bezel>
<bezel element="switch_qa" inputtag="IN.2" inputmask="0x1f" inputraw="1"><bounds x="15" y="3" width="2" height="2" /></bezel>
<bezel element="switch_act" inputtag="IN.3" inputmask="0x0f" inputraw="1"><bounds x="15" y="6" width="2" height="2" /></bezel>

4
src/mame/layout/copycat.lay
View File

@ -116,13 +116,13 @@
<bezel element="text_b2"><bounds x="5.125" y="6.7" width="1.75" height="0.25" /></bezel>
<bezel element="text_b3"><bounds x="6.2375" y="6.7" width="1.9" height="0.25" /></bezel>
<bezel element="nothing" inputtag="DUMMY" inputmask="0x01"><bounds x="6.25" y="4.9" width="1.2" height="0.5" /></bezel>
<bezel element="nothing" inputtag="IN.2" inputmask="0x00" inputraw="1"><bounds x="6.25" y="4.9" width="1.2" height="0.5" /></bezel>
<bezel element="switch" inputtag="IN.1" inputmask="0x0f" inputraw="1"><bounds x="6.3" y="4.925" width="1" height="0.25" /></bezel>
<bezel element="text_s1"><bounds x="5.15" y="4.925" width="1.5" height="0.25" /></bezel>
<bezel element="text_ro"><bounds x="5.825" y="4.875" width="0.35" height="0.35" /></bezel>
<bezel element="nothing" inputtag="IN.1" inputmask="0x0f" inputraw="1"><bounds x="5.8" y="4.85" width="0.4" height="0.4" /></bezel>
<bezel element="nothing" inputtag="DUMMY" inputmask="0x01"><bounds x="6.25" y="7.2" width="1.2" height="0.5" /></bezel>
<bezel element="nothing" inputtag="IN.2" inputmask="0x00" inputraw="1"><bounds x="6.25" y="7.2" width="1.2" height="0.5" /></bezel>
<bezel element="switch" inputtag="IN.2" inputmask="0x07" inputraw="1"><bounds x="6.3" y="7.275" width="1" height="0.25" /></bezel>
<bezel element="text_s2"><bounds x="5.15" y="7.275" width="1.5" height="0.25" /></bezel>
<bezel element="text_rg"><bounds x="5.825" y="7.225" width="0.35" height="0.35" /></bezel>

2
src/mame/layout/matchme.lay
View File

@ -161,7 +161,7 @@
<bezel element="nothing" inputtag="IN.3" inputmask="0x08" inputraw="1"><bounds x="9.805" y="9.55" width="0.39" height="0.39" /></bezel>
<bezel element="nothing" inputtag="IN.3" inputmask="0x07" inputraw="1"><bounds x="9.805" y="9.95" width="0.39" height="0.39" /></bezel>
<bezel element="nothing" inputtag="DUMMY" inputmask="0x01"><bounds x="10.2" y="8.7" width="1.1" height="1.8" /></bezel>
<bezel element="nothing" inputtag="FAKE" inputmask="0x00" inputraw="1"><bounds x="10.2" y="8.7" width="1.1" height="1.8" /></bezel>
<bezel element="switch_music" inputtag="FAKE" inputmask="0x02" inputraw="1"><bounds x="10.25" y="8.8" width="1" height="0.29" /></bezel>
<bezel element="switch_speed" inputtag="IN.4" inputmask="0x01" inputraw="1"><bounds x="10.25" y="9.2" width="1" height="0.29" /></bezel>
<bezel element="switch_skill" inputtag="IN.3" inputmask="0x08" inputraw="1"><bounds x="10.25" y="9.6" width="1" height="0.29" /></bezel>

2
src/mame/layout/saitek_ssystem3.lay
View File

@ -100,7 +100,7 @@
<bounds left="-2" right="48" top="2" bottom="32" />
<screen index="0"><bounds x="0" y="4" width="15.8" height="6" /></screen>
<overlay element="nothing" inputtag="DUMMY" inputmask="0x01"><bounds x="-1" y="3" width="18" height="8" /></overlay>
<overlay element="nothing" inputtag="IN.4" inputmask="0x00" inputraw="1"><bounds x="-1" y="3" width="18" height="8" /></overlay>
<overlay element="lcd_bg" inputtag="IN.4" inputmask="0x02" inputraw="1"><bounds x="-1" y="3" width="18" height="8" /></overlay>
<bezel element="brown"><bounds x="-2" y="12" width="52" height="6" /></bezel>

4
src/mame/layout/simon.lay
View File

@ -195,7 +195,7 @@
<bezel element="text_game">
<bounds x="68" y="93" width="20" height="4" />
</bezel>
<bezel element="nothing" inputtag="DUMMY" inputmask="0x01">
<bezel element="nothing" inputtag="IN.0" inputmask="0x00" inputraw="1">
<bounds x="73.9" y="97.9" width="3.2" height="4.2" />
</bezel>
<bezel element="switch_game" inputtag="IN.0" inputmask="0x07" inputraw="1">
@ -217,7 +217,7 @@
<bezel element="text_skill">
<bounds x="112" y="93" width="30" height="4" />
</bezel>
<bezel element="nothing" inputtag="DUMMY" inputmask="0x01">
<bezel element="nothing" inputtag="IN.3" inputmask="0x00" inputraw="1">
<bounds x="122.9" y="97.9" width="3.2" height="4.2" />
</bezel>
<bezel element="switch_skill" inputtag="IN.3" inputmask="0x0f" inputraw="1">

6
src/mame/layout/ssimon.lay
View File

@ -209,7 +209,7 @@
<bezel element="text_s3"><bounds x="-3.9" y="32.15" width="3.5" height="0.9" /></bezel>
<bezel element="static_black2"><bounds x="-6.5" y="29.125" width="0.5" height="4.5" /></bezel>
<bezel element="nothing" inputtag="DUMMY" inputmask="0x01"><bounds x="-7.25" y="29.125" width="2" height="4.5" /></bezel>
<bezel element="nothing" inputtag="IN.6" inputmask="0x00" inputraw="1"><bounds x="-7.25" y="29.125" width="2" height="4.5" /></bezel>
<bezel element="switch0" inputtag="IN.6" inputmask="0x03" inputraw="1"><bounds x="-7" y="29.625" width="1.5" height="1" /></bezel>
<bezel element="switch1" inputtag="IN.6" inputmask="0x03" inputraw="1"><bounds x="-7" y="30.875" width="1.5" height="1" /></bezel>
<bezel element="switch2" inputtag="IN.6" inputmask="0x03" inputraw="1"><bounds x="-7" y="32.125" width="1.5" height="1" /></bezel>
@ -242,7 +242,7 @@
<bezel element="text_4"><bounds x="50.25" y="34.65" width="1" height="0.9" /></bezel>
<bezel element="static_black2"><bounds x="53" y="16.875" width="0.5" height="7" /></bezel>
<bezel element="nothing" inputtag="DUMMY" inputmask="0x01"><bounds x="52.25" y="16.875" width="2" height="7" /></bezel>
<bezel element="nothing" inputtag="IN.0" inputmask="0x00" inputraw="1"><bounds x="52.25" y="16.875" width="2" height="7" /></bezel>
<bezel element="switch0" inputtag="IN.0" inputmask="0x0f" inputraw="1"><bounds x="52.5" y="17.375" width="1.5" height="1" /></bezel>
<bezel element="switch8" inputtag="IN.0" inputmask="0x0f" inputraw="1"><bounds x="52.5" y="18.625" width="1.5" height="1" /></bezel>
<bezel element="switch4" inputtag="IN.0" inputmask="0x0f" inputraw="1"><bounds x="52.5" y="19.875" width="1.5" height="1" /></bezel>
@ -250,7 +250,7 @@
<bezel element="switch1" inputtag="IN.0" inputmask="0x0f" inputraw="1"><bounds x="52.5" y="22.375" width="1.5" height="1" /></bezel>
<bezel element="static_black2"><bounds x="53" y="29.125" width="0.5" height="7" /></bezel>
<bezel element="nothing" inputtag="DUMMY" inputmask="0x01"><bounds x="52.25" y="29.125" width="2" height="7" /></bezel>
<bezel element="nothing" inputtag="IN.4" inputmask="0x00" inputraw="1"><bounds x="52.25" y="29.125" width="2" height="7" /></bezel>
<bezel element="switch0" inputtag="IN.4" inputmask="0x0f" inputraw="1"><bounds x="52.5" y="29.625" width="1.5" height="1" /></bezel>
<bezel element="switch2" inputtag="IN.4" inputmask="0x0f" inputraw="1"><bounds x="52.5" y="30.875" width="1.5" height="1" /></bezel>
<bezel element="switch4" inputtag="IN.4" inputmask="0x0f" inputraw="1"><bounds x="52.5" y="32.125" width="1.5" height="1" /></bezel>