From 617b73e599f67b1e04b58a3297a57d37464271c1 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 24 Mar 2019 01:35:14 -0400 Subject: [PATCH 1/5] dai2kaku: Fix regression by eliminating stupid hack (nw) --- src/mame/drivers/realbrk.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/drivers/realbrk.cpp b/src/mame/drivers/realbrk.cpp index 688b3c888ff..5bcc5ab632a 100644 --- a/src/mame/drivers/realbrk.cpp +++ b/src/mame/drivers/realbrk.cpp @@ -217,7 +217,6 @@ void realbrk_state::dai2kaku_mem(address_map &map) map(0xc00002, 0xc00003).portr("IN1"); // Coins map(0xc00004, 0xc00005).ram().r(FUNC(realbrk_state::realbrk_dsw_r)).share("dsw_select"); // DSW select map(0xff0000, 0xfffbff).ram(); // RAM - map(0xfffd0a, 0xfffd0b).w(FUNC(realbrk_state::dai2kaku_flipscreen_w)); // Hack! Parallel port data register } /*************************************************************************** @@ -819,6 +818,7 @@ void realbrk_state::dai2kaku(machine_config &config) realbrk(config); m_maincpu->set_addrmap(AS_PROGRAM, &realbrk_state::dai2kaku_mem); + m_maincpu->out_parallel_callback().set(FUNC(realbrk_state::dai2kaku_flipscreen_w)); m_gfxdecode->set_info(gfx_dai2kaku); m_screen->set_screen_update(FUNC(realbrk_state::screen_update_dai2kaku)); From 98935f21efa1a46dc1c9e4958c3f470f6105cf63 Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 25 Mar 2019 13:07:09 +0100 Subject: [PATCH 2/5] layout doc/complay inputraw stuff (nw) --- docs/source/techspecs/layout_files.rst | 16 +++++++++------- scripts/build/complay.py | 10 +++++++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/docs/source/techspecs/layout_files.rst b/docs/source/techspecs/layout_files.rst index b12ad931df4..10467a8d0e9 100644 --- a/docs/source/techspecs/layout_files.rst +++ b/docs/source/techspecs/layout_files.rst @@ -32,7 +32,7 @@ There are two kinds of numbers in MAME layouts: integers and floating-point numbers. Integers may be supplied in decimal or hexadecimal notation. A decimal integer -consists of and optional # (hash) prefix, an optional +/- (plus or minus) sign +consists of an optional # (hash) prefix, an optional +/- (plus or minus) sign character, and a sequence of digits 0-9. A hexadecimal number consists of one of the prefixes $ (dollar sign) or 0x (zero ex) followed by a sequence of hexadecimal digits 0-9 and A-F. Hexadecimal numbers are case-insensitive for @@ -768,12 +768,14 @@ how digital displays may be connected to emulated outputs:: If an element instantiating a layout element has ``inputtag`` and ``inputmask`` attributes but lacks a ``name`` attribute, it will take its state from the value -of the corresponding I/O port, masked with the ``inputmask`` value, and shifted -to the right so that the least significant one bit of the mask aligns with the -least significant bit of the value (for example a mask of 0x05 will result in no -shift, while a mask of 0xb0 will result in the value being shifted four bits to -the right). This is often used to allow clickable buttons and toggle switches -to provide visible feedback. +of the corresponding I/O port, masked with the ``inputmask`` value and XORed +with the I/O port default field value. The latter is useful for inputs that are +active-low. If the result is non-zero, the state is 1, otherwise it's 0. This +is often used to allow clickable buttons and toggle switches to provide visible +feedback. By using ``inputraw="1"``, it's possible to obtain the raw data from +the I/O port, masked with the ``inputmask`` value and shifted to the right to +remove trailing zeroes (for example a mask of 0x05 will result in no shift, while +a mask of 0xb0 will result in the value being shifted four bits to the right). When handling mouse input, MAME treats all layout elements as being rectangular, and only activates the frontmost element whose area includes the location of the diff --git a/scripts/build/complay.py b/scripts/build/complay.py index dff981e65c9..b89ca98e19a 100644 --- a/scripts/build/complay.py +++ b/scripts/build/complay.py @@ -455,10 +455,18 @@ class LayoutChecker(Minifyer): self.handleError('Element %s has inputtag attribute without inputmask attribute' % (name, )) self.checkTag(attrs['inputtag'], name, 'inputtag') elif 'inputmask' in attrs: - self.handleError('Element %s has inputmask attribute without inputtag attirbute' % (name, )) + 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: + self.handleError('Element %s has inputraw attribute without inputmask attribute' % (name, )) + if 'inputtag' not in attrs: + 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'])) self.handlers.append((self.objectStartHandler, self.objectEndHandler)) self.have_bounds.append(False) self.have_orientation.append(False) From 4b1f87ca45d1fae8ace2ba865dcafd4a71e8ddc4 Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 25 Mar 2019 22:24:57 +0100 Subject: [PATCH 3/5] add updated layouts to release branch (nw) --- src/mame/layout/ctstein.lay | 49 ++++++++++++++++ src/mame/layout/matchme.lay | 111 ++++++++++++++++++++++++++++++------ src/mame/layout/touchme.lay | 109 +++++++++++++++++++++++++---------- 3 files changed, 220 insertions(+), 49 deletions(-) diff --git a/src/mame/layout/ctstein.lay b/src/mame/layout/ctstein.lay index d86f5caa719..a38d1f9bcfe 100644 --- a/src/mame/layout/ctstein.lay +++ b/src/mame/layout/ctstein.lay @@ -3,6 +3,7 @@ + @@ -22,6 +23,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -95,5 +133,16 @@ + + + + + + + + + + + diff --git a/src/mame/layout/matchme.lay b/src/mame/layout/matchme.lay index e420abefe7e..b36d624e647 100644 --- a/src/mame/layout/matchme.lay +++ b/src/mame/layout/matchme.lay @@ -29,50 +29,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + @@ -94,6 +147,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -122,14 +195,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/mame/layout/touchme.lay b/src/mame/layout/touchme.lay index 00745eaa252..7d514b91729 100644 --- a/src/mame/layout/touchme.lay +++ b/src/mame/layout/touchme.lay @@ -34,6 +34,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -53,14 +78,14 @@ - + - + @@ -75,37 +100,45 @@ - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + @@ -151,5 +184,21 @@ + + + + + + + + + + + + + + + + From a9f5142e17ce2c754a4b8938ca5fb1f382476dab Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 27 Mar 2019 12:18:38 +1100 Subject: [PATCH 4/5] (nw) title consistency fix --- hash/spectrum_flop_opus.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash/spectrum_flop_opus.xml b/hash/spectrum_flop_opus.xml index 629355df228..fc7f6b9cdb3 100644 --- a/hash/spectrum_flop_opus.xml +++ b/hash/spectrum_flop_opus.xml @@ -697,7 +697,7 @@ - Spectrum Discovery Club Newsletter Xmas Bonus December1990 + Spectrum Discovery Club Newsletter Xmas Bonus December 1990 1990 Spectrum Discovery Club From 94836248644221eea9d4e6848347031de5a061d5 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 27 Mar 2019 14:30:17 +1100 Subject: [PATCH 5/5] version bump (nw) --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index f450c57b31a..5744d1b72aa 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index 71a5b6b1e5c..255af28b931 100644 --- a/makefile +++ b/makefile @@ -1625,14 +1625,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.207"' > $@ + @echo '#define BARE_BUILD_VERSION "0.208"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.207" > $@ + @echo #define BARE_BUILD_VERSION "0.208" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@