From 6a857daed7cc1587c9ae63dd5cb426cc2f2bbebc Mon Sep 17 00:00:00 2001 From: hap Date: Sat, 24 Aug 2019 12:19:42 +0200 Subject: [PATCH] complay: allow inputmask=0 when inputraw=1 for canceling input listener section (nw) --- scripts/build/complay.py | 7 ++++--- src/mame/drivers/hh_pic16.cpp | 3 --- src/mame/drivers/hh_sm510.cpp | 8 ++++---- src/mame/drivers/hh_tms1k.cpp | 12 ------------ src/mame/drivers/saitek_ssystem3.cpp | 3 --- src/mame/layout/alphie.lay | 2 +- src/mame/layout/copycat.lay | 4 ++-- src/mame/layout/matchme.lay | 2 +- src/mame/layout/saitek_ssystem3.lay | 2 +- src/mame/layout/simon.lay | 4 ++-- src/mame/layout/ssimon.lay | 6 +++--- 11 files changed, 18 insertions(+), 35 deletions(-) diff --git a/scripts/build/complay.py b/scripts/build/complay.py index 3f2a0d8b6b5..72bdcfa01c8 100644 --- a/scripts/build/complay.py +++ b/scripts/build/complay.py @@ -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) diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp index 120cefca02f..9a566101ef4 100644 --- a/src/mame/drivers/hh_pic16.cpp +++ b/src/mame/drivers/hh_pic16.cpp @@ -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) diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp index 83b45d31b71..87915df172b 100644 --- a/src/mame/drivers/hh_sm510.cpp +++ b/src/mame/drivers/hh_sm510.cpp @@ -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) ) diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index bec7244c24c..785b21de3e8 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -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) diff --git a/src/mame/drivers/saitek_ssystem3.cpp b/src/mame/drivers/saitek_ssystem3.cpp index 818c25816c4..6402a5b2dcd 100644 --- a/src/mame/drivers/saitek_ssystem3.cpp +++ b/src/mame/drivers/saitek_ssystem3.cpp @@ -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 diff --git a/src/mame/layout/alphie.lay b/src/mame/layout/alphie.lay index 6d417825279..d272a45d4dd 100644 --- a/src/mame/layout/alphie.lay +++ b/src/mame/layout/alphie.lay @@ -62,7 +62,7 @@ - + diff --git a/src/mame/layout/copycat.lay b/src/mame/layout/copycat.lay index 418915877b9..9bf5350b57a 100644 --- a/src/mame/layout/copycat.lay +++ b/src/mame/layout/copycat.lay @@ -116,13 +116,13 @@ - + - + diff --git a/src/mame/layout/matchme.lay b/src/mame/layout/matchme.lay index 143045eee1f..dc7ea2e2d6d 100644 --- a/src/mame/layout/matchme.lay +++ b/src/mame/layout/matchme.lay @@ -161,7 +161,7 @@ - + diff --git a/src/mame/layout/saitek_ssystem3.lay b/src/mame/layout/saitek_ssystem3.lay index 2ee69643be9..3d4ffe81c29 100644 --- a/src/mame/layout/saitek_ssystem3.lay +++ b/src/mame/layout/saitek_ssystem3.lay @@ -100,7 +100,7 @@ - + diff --git a/src/mame/layout/simon.lay b/src/mame/layout/simon.lay index 98129551cfb..41d05aa501e 100644 --- a/src/mame/layout/simon.lay +++ b/src/mame/layout/simon.lay @@ -195,7 +195,7 @@ - + @@ -217,7 +217,7 @@ - + diff --git a/src/mame/layout/ssimon.lay b/src/mame/layout/ssimon.lay index 9be8cca7a43..83b8991cee0 100644 --- a/src/mame/layout/ssimon.lay +++ b/src/mame/layout/ssimon.lay @@ -209,7 +209,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -250,7 +250,7 @@ - +