MAME 0.240

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmH1jVMACgkQwXSxAYxA
 cQ5LYw//RnODFgLZUG10ukL9TVFB6yC4rNGIOfcV/iXhMOKUhJF5R1vwlBCVdPaz
 wUXtsOyc6k5LkmTscVbsvAq4Afx4baidBZRZ6o0IgHlNZLqgoKLkbPSOtRBEP7bQ
 vtBPhEA8Dk42tC8j+GFN8DiYJZNJSB+0kJcu2oRrSOk5NQNfbC5JQqfq5hxKdpFt
 Ijkh9id5S6n04cirNT8HYhVUseicIvDSu41x0VKjOlCxKzbmdd7ztuRQXMDxd0kF
 OvK8N2BgfGqfiRsyMkJbKwC5m17q5au+lznFsEQooxcCOa/0ZAgWBeJCQ2JNwtU3
 B6porHdhERf3R53aOw7Fqudp6OmfDYBYGbji7lLwFM5F/iTEIysWiTAVBUWVgvnI
 rsxjk6/dpjHHYI++xBQZ+v7eygB+yHJU0+sJCdhE2cZKasUPJcewZht/n9ETEp3R
 sPRHMg3Q3AejJ4wUpaP4BOVl3C7Q8tsk5nHj5RSQk1Njuh1nBJ7SjUsWxRc6svf6
 B7ecMSo9huD9KZS1ZFkBgWnaOvdEP/kzr336vSiMtNjQLjzyWZ5zYE4gFxH4bVT9
 UiB6dIU0LK3mtSVx4LhxzvFtF1PCw68jru3/pa1rC1D7WkixN682IzY7+lu3VMK/
 aHXoZWKdUJmj32rgRlN8IV0JEB1J9m7mXv5sl2aZYTvp42Dvp2s=
 =E+il
 -----END PGP SIGNATURE-----

Merge tag 'mame0240' into mainline-master

MAME 0.240
This commit is contained in:
Vas Crabb 2022-01-30 16:31:29 +11:00
commit f335e059e4
14 changed files with 108 additions and 98 deletions

View File

@ -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

View File

@ -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

View File

@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="239"
android:versionName="0.239"
android:versionCode="240"
android:versionName="0.240"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->

View File

@ -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.

View File

@ -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

View File

@ -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**
|

View File

@ -10701,7 +10701,7 @@ license:CC0
</software>
<software name="aliengatu">
<description>Alien Gate (US)</description>
<description>Alien Gate (US, set 1)</description>
<year>1992</year>
<publisher>The Vision Factory</publisher>
<part name="cdrom" interface="cdi_cdrom">
@ -10712,7 +10712,7 @@ license:CC0
</software>
<software name="aliengatu1">
<description>Alien Gate (US, set 1)</description>
<description>Alien Gate (US, set 2)</description>
<year>1992</year>
<publisher>The Vision Factory</publisher>
<part name="cdrom" interface="cdi_cdrom">

View File

@ -303,7 +303,7 @@ The monitor will expect you to load a program from cassette.
<software name="aerial">
<description>Aerial</description>
<year>2021</year>
<publisher>Inufoto</publisher>
<publisher>Inufuto</publisher>
<part name="cart" interface="rx78_cart">
<dataarea name="rom" size="0x4000">
<rom name="aerial.bin" size="0x2d7c" crc="64406f92" sha1="eee0b9584c2d09c5a8dff0ceaadd654b34aab608" />
@ -313,7 +313,7 @@ The monitor will expect you to load a program from cassette.
<software name="battlot">
<description>Battlot</description>
<year>2021</year>
<publisher>Inufoto</publisher>
<publisher>Inufuto</publisher>
<part name="cart" interface="rx78_cart">
<dataarea name="rom" size="0x4000">
<rom name="battlot.bin" size="0x2f46" crc="d1236463" sha1="25375a30b32ce6a083273d27d46ccac3b271bd31" />
@ -323,7 +323,7 @@ The monitor will expect you to load a program from cassette.
<software name="bootskell">
<description>Bootskell</description>
<year>2021</year>
<publisher>Inufoto</publisher>
<publisher>Inufuto</publisher>
<part name="cart" interface="rx78_cart">
<dataarea name="rom" size="0x4000">
<rom name="bootskell.bin" size="0x2fb4" crc="8c9b02e9" sha1="6eb1c4345636c17cb72cba6590bb07ac8bfee31b" />
@ -333,7 +333,7 @@ The monitor will expect you to load a program from cassette.
<software name="cavit">
<description>Cavit</description>
<year>2021</year>
<publisher>Inufoto</publisher>
<publisher>Inufuto</publisher>
<part name="cart" interface="rx78_cart">
<dataarea name="rom" size="0x4000">
<rom name="cavit.bin" size="0x33d7" crc="6c3c5729" sha1="32eb81614672a66fe7e672c01e121dedf2777fca" />
@ -343,7 +343,7 @@ The monitor will expect you to load a program from cassette.
<software name="lift">
<description>Lift</description>
<year>2021</year>
<publisher>Inufoto</publisher>
<publisher>Inufuto</publisher>
<part name="cart" interface="rx78_cart">
<dataarea name="rom" size="0x4000">
<rom name="lift.bin" size="0x2635" crc="fe79dd47" sha1="2d165c4e32e4c5c81b7c05df18a51b92ba9a8951" />
@ -353,7 +353,7 @@ The monitor will expect you to load a program from cassette.
<software name="neuras">
<description>Neuras</description>
<year>2021</year>
<publisher>Inufoto</publisher>
<publisher>Inufuto</publisher>
<part name="cart" interface="rx78_cart">
<dataarea name="rom" size="0x4000">
<rom name="neuras.bin" size="0x2c03" crc="3a7758ef" sha1="0043e72dd22c8adccd8e7f7bc3ab85322ecfe024" />
@ -363,7 +363,7 @@ The monitor will expect you to load a program from cassette.
<software name="ruptus">
<description>Ruptus</description>
<year>2021</year>
<publisher>Inufoto</publisher>
<publisher>Inufuto</publisher>
<part name="cart" interface="rx78_cart">
<dataarea name="rom" size="0x4000">
<rom name="ruptus.bin" size="0x37a6" crc="6b903647" sha1="a5d4dbf22bbe55efdd27b8237ad39074bb80b822" />

View File

@ -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[]; >> $@

View File

@ -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.

View File

@ -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<uint8_t []>(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<uint8_t[]>(FB_WIDTH*FB_HEIGHT/8);
SCC8530N(config, m_scc, CPU_CLK);
m_scc->configure_channels(RXC_CLK, 0, RXC_CLK, 0);

View File

@ -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

View File

@ -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.

View File

@ -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.