diff --git a/COPYING b/COPYING index 0fe8ef9213d..aa77b5f2959 100644 --- a/COPYING +++ b/COPYING @@ -10,7 +10,7 @@ distributions. MAME -Copyright (c) 1997-2021 MAMEdev and contributors +Copyright (c) 1997-2022 MAMEdev and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, as provided diff --git a/android-project/LICENSE b/android-project/LICENSE index b79d3ac3812..8b836db2c20 100644 --- a/android-project/LICENSE +++ b/android-project/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2021, MAME Development Team +Copyright (c) 2022, MAMEdev and contributors All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index ff460544900..599337c3b43 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/docs/source/conf.py b/docs/source/conf.py index 95dc1d19bbf..c15876b1165 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -56,16 +56,16 @@ master_doc = 'index' # General information about the project. project = u'MAME Documentation' -copyright = u'1997-2021, MAMEdev and contributors' +copyright = u'1997-2022, MAMEdev and contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.238' +version = '0.240' # The full version, including alpha/beta/rc tags. -release = '0.238' +release = '0.240' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/source/license.rst b/docs/source/license.rst index fd72712d9d8..d11b51b0f99 100644 --- a/docs/source/license.rst +++ b/docs/source/license.rst @@ -12,7 +12,7 @@ would encourage new contributors to distribute files under this license. Please note that MAME is a registered trademark of Gregory Ember, and permission is required to use the “MAME” name, logo, or wordmark. - Copyright (C) 1997-2021 MAMEDev and contributors + Copyright (C) 1997-2022 MAMEDev and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/docs/source/whatis.rst b/docs/source/whatis.rst index 6f6f772e480..ccc1643fa1c 100644 --- a/docs/source/whatis.rst +++ b/docs/source/whatis.rst @@ -19,7 +19,7 @@ that were its initial focus. | | **MAME®** -| **Copyright © 1997-2021 Nicola Salmoria and the MAME team** +| **Copyright © 1997-2022 Nicola Salmoria and the MAME team** | **MAME is a registered trademark of Gregory Ember** | diff --git a/hash/cdi.xml b/hash/cdi.xml index d20a0a0766b..fdbc0abfc26 100644 --- a/hash/cdi.xml +++ b/hash/cdi.xml @@ -10701,7 +10701,7 @@ license:CC0 - Alien Gate (US) + Alien Gate (US, set 1) 1992 The Vision Factory @@ -10712,7 +10712,7 @@ license:CC0 - Alien Gate (US, set 1) + Alien Gate (US, set 2) 1992 The Vision Factory diff --git a/hash/rx78_cart.xml b/hash/rx78_cart.xml index 64d044b021c..910b0f7dbbc 100644 --- a/hash/rx78_cart.xml +++ b/hash/rx78_cart.xml @@ -303,7 +303,7 @@ The monitor will expect you to load a program from cassette. Aerial 2021 - Inufoto + Inufuto @@ -313,7 +313,7 @@ The monitor will expect you to load a program from cassette. Battlot 2021 - Inufoto + Inufuto @@ -323,7 +323,7 @@ The monitor will expect you to load a program from cassette. Bootskell 2021 - Inufoto + Inufuto @@ -333,7 +333,7 @@ The monitor will expect you to load a program from cassette. Cavit 2021 - Inufoto + Inufuto @@ -343,7 +343,7 @@ The monitor will expect you to load a program from cassette. Lift 2021 - Inufoto + Inufuto @@ -353,7 +353,7 @@ The monitor will expect you to load a program from cassette. Neuras 2021 - Inufoto + Inufuto @@ -363,7 +363,7 @@ The monitor will expect you to load a program from cassette. Ruptus 2021 - Inufoto + Inufuto diff --git a/makefile b/makefile index 5f091b9d10c..88dfa3ca859 100644 --- a/makefile +++ b/makefile @@ -1546,7 +1546,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.239"' > $@ + @echo '#define BARE_BUILD_VERSION "0.240"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1556,7 +1556,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) @echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.239" > $@ + @echo #define BARE_BUILD_VERSION "0.240" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ diff --git a/regtests/LICENSE b/regtests/LICENSE index b79d3ac3812..7c875c643a3 100644 --- a/regtests/LICENSE +++ b/regtests/LICENSE @@ -1,27 +1,29 @@ -Copyright (c) 2021, MAME Development Team +Copyright (c) 2022, MAMEdev and contributors All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +modification, are permitted provided that the following conditions are +met: -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. -* Neither the name of bsd3 nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp index bc553f939dc..1af417e8a75 100644 --- a/src/mame/drivers/lwriter.cpp +++ b/src/mame/drivers/lwriter.cpp @@ -97,6 +97,7 @@ #include "cpu/m68000/m68000.h" #include "machine/6522via.h" #include "machine/z80scc.h" + #include "screen.h" #define LOG_GENERAL (1U << 0) @@ -144,10 +145,14 @@ public: void lwriter2nt(machine_config &config); protected: - virtual void machine_start () override; - virtual void machine_reset () override; + virtual void machine_start() override; + virtual void machine_reset() override; private: + // A guess based on not very much + static constexpr unsigned FB_HEIGHT = 3434; + static constexpr unsigned FB_WIDTH = 2520; + uint16_t bankedarea_r(offs_t offset); void bankedarea_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t eeprom_r(offs_t offset); @@ -305,8 +310,11 @@ INPUT_PORTS_END /* Start it up */ void lwriter_state::machine_start() { + m_vram = make_unique_clear(FB_WIDTH * FB_HEIGHT / 8); + // do stuff here later on like setting up printer mechanisms HLE timers etc - m_pb6_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(lwriter_state::pb6_tick),this)); + m_pb6_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(lwriter_state::pb6_tick), this)); + m_pb6_timer->adjust(attotime::from_hz(PB6_CLK)); // Initialize ca1 to 1 so that we don't miss the first interrupt/transition to 0 m_via->write_ca1(1); @@ -415,9 +423,6 @@ void lwriter_state::led_out_w(uint8_t data) popmessage("LED status: %x %x %x %x %x %x %x %x\n", data&0x80, data&0x40, data&0x20, data&0x10, data&0x8, data&0x4, data&0x2, data&0x1); } -// A guess based on not very much -#define FB_HEIGHT 3434 -#define FB_WIDTH 2520 /* FIFO to printer, 64 bytes long */ void lwriter_state::fifo_out_w(uint8_t data) { @@ -619,19 +624,19 @@ void lwriter_state::write_dtr(int state) uint32_t lwriter_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { + auto const f = [] (auto x) { return x ? u32(0) : u32(0xffffffff); }; for (int y = 0; y < FB_HEIGHT; y++) { for (int x = 0; x < FB_WIDTH; x += 8) { uint32_t *scanline = &bitmap.pix(y, x); - uint8_t pixels = m_vram[y * FB_WIDTH/8 + x/8]; -#define f(x) ((x) ? (0) : (0xffffffff)) - *scanline++ = f(pixels&0x80); - *scanline++ = f((pixels<<1)&0x80); - *scanline++ = f((pixels<<2)&0x80); - *scanline++ = f((pixels<<3)&0x80); - *scanline++ = f((pixels<<4)&0x80); - *scanline++ = f((pixels<<5)&0x80); - *scanline++ = f((pixels<<6)&0x80); - *scanline++ = f((pixels<<7)&0x80); + uint8_t const pixels = m_vram[y * FB_WIDTH/8 + x/8]; + *scanline++ = f(BIT(pixels, 7)); + *scanline++ = f(BIT(pixels, 6)); + *scanline++ = f(BIT(pixels, 5)); + *scanline++ = f(BIT(pixels, 4)); + *scanline++ = f(BIT(pixels, 3)); + *scanline++ = f(BIT(pixels, 2)); + *scanline++ = f(BIT(pixels, 1)); + *scanline++ = f(BIT(pixels, 0)); } } @@ -655,7 +660,6 @@ void lwriter_state::lwriter(machine_config &config) m_screen->set_size(FB_WIDTH, FB_HEIGHT); m_screen->set_visarea_full(); m_screen->set_screen_update(FUNC(lwriter_state::screen_update)); - m_vram = make_unique_clear(FB_WIDTH*FB_HEIGHT/8); SCC8530N(config, m_scc, CPU_CLK); m_scc->configure_channels(RXC_CLK, 0, RXC_CLK, 0); diff --git a/src/tools/testkeys.cpp b/src/tools/testkeys.cpp index 8e262733302..3c00dd79854 100644 --- a/src/tools/testkeys.cpp +++ b/src/tools/testkeys.cpp @@ -2,7 +2,7 @@ // // testkeys.cpp - A small utility to analyze SDL keycodes // -// Copyright (c) 1996-2021, Nicola Salmoria and the MAME Team. +// Copyright (c) 1996-2022, Nicola Salmoria and the MAME Team. // Visit https://mamedev.org for licensing and usage restrictions. // // SDLMAME by Olivier Galibert and R. Belmont diff --git a/tests/LICENSE b/tests/LICENSE index b79d3ac3812..7c875c643a3 100644 --- a/tests/LICENSE +++ b/tests/LICENSE @@ -1,27 +1,29 @@ -Copyright (c) 2021, MAME Development Team +Copyright (c) 2022, MAMEdev and contributors All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +modification, are permitted provided that the following conditions are +met: -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. -* Neither the name of bsd3 nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/web/LICENSE b/web/LICENSE index b79d3ac3812..7c875c643a3 100644 --- a/web/LICENSE +++ b/web/LICENSE @@ -1,27 +1,29 @@ -Copyright (c) 2021, MAME Development Team +Copyright (c) 2022, MAMEdev and contributors All rights reserved. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +modification, are permitted provided that the following conditions are +met: -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. -* Neither the name of bsd3 nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.