diff options
author | Vas Crabb <vas@vastheman.com> | 2018-04-25 12:15:32 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-04-25 12:15:32 +1000 |
commit | ad05858554e7ad85f24ac71914023f0d0c6fbc04 (patch) | |
tree | a0da7918bfc58ab5973b266315bb7c206144517d | |
parent | b38b7c9dffefbe2d1779b3c23e2e8d9c1dae4731 (diff) | |
parent | 74293f8247e251102fcf2d2d9cd5195d73871311 (diff) |
Merge tag 'mame0197'
MAME 0.197
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | hash/pc98_cd.xml | 2 | ||||
-rw-r--r-- | makefile | 4 | ||||
-rw-r--r-- | src/mame/drivers/neogeo.cpp | 10 | ||||
-rw-r--r-- | src/mame/includes/neogeo.h | 1 |
5 files changed, 15 insertions, 6 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 9ef896dc026..5056e2940fc 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -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 --> diff --git a/hash/pc98_cd.xml b/hash/pc98_cd.xml index fdd33db418d..02a643778ac 100644 --- a/hash/pc98_cd.xml +++ b/hash/pc98_cd.xml @@ -3992,7 +3992,7 @@ <year>1995</year> <publisher>ビング (Ving)</publisher> <info name="serial" value="VHMD-129" /> - <info name="alt_title" value="スーパーリアル麻雀 PIV ファイナル" /> + <info name="alt_title" value="スーパーリアル麻雀 PIV ファイナル" /> <info name="release" value="19950216" /> <part name="cdrom" interface="cdrom"> <diskarea name="cdrom"> @@ -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; >> $@ diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp index f4210ca0a19..430e5267071 100644 --- a/src/mame/drivers/neogeo.cpp +++ b/src/mame/drivers/neogeo.cpp @@ -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)); diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index 430b55008e8..ab3d35d8073 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -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); |