Merge tag 'mame0249' into rel249

MAME 0.249
mahlemiut · Oct 27, 2022 · a108173 · a108173
2 parents f9b2c72 + 91c5b9e
commit a108173
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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="248"
-      android:versionName="0.248"
+      android:versionCode="249"
+      android:versionName="0.249"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.248'
+version = '0.249'
 # The full version, including alpha/beta/rc tags.
-release = '0.248'
+release = '0.249'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/makefile b/makefile
@@ -1579,7 +1579,7 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.248"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.249"' > $@
 	@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1589,7 +1589,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
 	@echo 'const char build_version[] = BARE_BUILD_VERSION "W (" BARE_VCS_REVISION ")";' >> $@
 else
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo #define BARE_BUILD_VERSION "0.248" > $@
+	@echo #define BARE_BUILD_VERSION "0.249" > $@
 	@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/src/mame/misc/mtu130.cpp b/src/mame/misc/mtu130.cpp
@@ -564,6 +564,7 @@ void mtu130_state::map(address_map &map)
 	map(0x0be00, 0x0bfff).view(m_io_view);                          // I/O dynamically overrides part of the main ram
 	m_io_view[1](0x0be00, 0x0bfff).unmaprw();                       // Fully mask out the ram when active
 	m_io_view[1](0x0bfc3, 0x0bfc3).r(FUNC(mtu130_state::id_r));
+	m_io_view[1](0x0bfc3, 0x0bfc3).w(FUNC(mtu130_state::id_reset_w));
 	m_io_view[1](0x0bfc5, 0x0bfc5).w(FUNC(mtu130_state::keyboard_col_clear_w));
 	m_io_view[1](0x0bfc7, 0x0bfc7).w(FUNC(mtu130_state::id_reset_w));
 	m_io_view[1](0x0bfc8, 0x0bfcb).rw(m_acia, FUNC(mos6551_device::read), FUNC(mos6551_device::write));