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

Merge tag 'mame0197'

Browse Source 
MAME 0.197
This commit is contained in:
Vas Crabb 2018-04-25 12:15:32 +10:00
commit ad05858554
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View File

@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="196"
android:versionName="0.196"
android:versionCode="197"
android:versionName="0.197"
android:installLocation="auto">
<!-- Android 5.0 -->

2
hash/pc98_cd.xml
View File

@ -3992,7 +3992,7 @@
<year>1995</year>
<publisher>ビング (Ving)</publisher>
<info name="serial" value="VHMD-129" />
<info name="alt_title" value="スーパーリアル麻雀 ＰIＶ ファイナル" />
<info name="alt_title" value="スーパーリアル麻雀 ＰＩＶ ファイナル" />
<info name="release" value="19950216" />
<part name="cdrom" interface="cdrom">
<diskarea name="cdrom">

4
makefile
View File

@ -1571,14 +1571,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.196"' > $@
@echo '#define BARE_BUILD_VERSION "0.197"' > $@
@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.196" > $@
@echo #define BARE_BUILD_VERSION "0.197" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@

10
src/mame/drivers/neogeo.cpp
View File

@ -946,6 +946,14 @@ WRITE8_MEMBER(mvs_state::io_control_w)
}
WRITE8_MEMBER(neogeo_base_state::audio_command_w)
{
// glitches in s1945p without the boost_interleave here
m_soundlatch->write(space, offset, data, mem_mask);
machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(50));
}
/*************************************
*
* Unmapped memory access
@ -1665,7 +1673,7 @@ READ16_MEMBER(neogeo_base_state::banked_vectors_r)
void neogeo_base_state::base_main_map(address_map &map)
{
map(0x320000, 0x320000).mirror(0x01fffe).w(m_soundlatch, FUNC(generic_latch_8_device::write));
map(0x320000, 0x320000).mirror(0x01fffe).w(this, FUNC(neogeo_base_state::audio_command_w));
map(0x360000, 0x37ffff).r(this, FUNC(neogeo_base_state::unmapped_r));
map(0x380000, 0x3800ff).mirror(0x01ff00).w(this, FUNC(neogeo_base_state::io_control_w)).umask16(0x00ff);
map(0x3a0000, 0x3a001f).mirror(0x01ffe0).r(this, FUNC(neogeo_base_state::unmapped_r));

1
src/mame/includes/neogeo.h
View File

@ -84,6 +84,7 @@ protected:
uint32_t screen_update_neogeo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
virtual DECLARE_WRITE8_MEMBER(io_control_w);
DECLARE_WRITE8_MEMBER(audio_command_w);
DECLARE_WRITE_LINE_MEMBER(set_use_cart_vectors);
DECLARE_WRITE_LINE_MEMBER(set_use_cart_audio);
DECLARE_READ16_MEMBER(banked_vectors_r);