Merge tag 'mame0261' into rel261

MAME 0.261
mahlemiut · Nov 28, 2023 · 07154f1 · 07154f1
2 parents de7d818 + ca50094
commit 07154f1
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 18 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="260"
-      android:versionName="0.260"
+      android:versionCode="261"
+      android:versionName="0.261"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/hash/spectrum_betadisc_flop.xml b/hash/spectrum_betadisc_flop.xml
@@ -488,7 +488,7 @@ license:CC0-1.0
 	</software>
 
 	<software name="kazan">
-		<description>Seto Taisho To Kazan</description>
+		<description>Seto Taisho to Kazan</description>
 		<year>2017</year>
 		<publisher>Monument Microgames</publisher>
 		<info name="developer" value="Alessandro Grussu" />

diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml
@@ -35766,7 +35766,7 @@ Side B - 5 - Campagna Abbonamenti (original release)
 	</software>
 
 	<software name="lnr4_it">
-		<description>Load'N'Run N. 4 (Italy) - Aprile 1984</description>
+		<description>Load'N'Run (Italy) N. 4 - Aprile 1984</description>
 		<year>1984</year>
 		<publisher>MK Periodici</publisher>
 		<notes><![CDATA[

diff --git a/makefile b/makefile
@@ -1564,7 +1564,7 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.260"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.261"' > $@
 	@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1574,7 +1574,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.260" > $@
+	@echo #define BARE_BUILD_VERSION "0.261" > $@
 	@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/devices/machine/t10mmc.cpp b/src/devices/machine/t10mmc.cpp
@@ -1273,19 +1273,15 @@ void t10mmc::ReadData( uint8_t *data, int dataLength )
 					data[ptr++] = 0x8e; // page E, parameter is savable
 					data[ptr++] = 0x0e; // page length
 					data[ptr++] = (1 << 2) | (m_sotc << 1); // IMMED = 1
-					ptr += 6;   // skip reserved bytes
-					// connect each audio channel to 1 output port
+					ptr += 5;   // skip reserved bytes
+					// connect each audio channel to 1 output port and indicate max volume
 					data[ptr++] = 1;
-					data[ptr++] = 2;
-					data[ptr++] = 4;
-					data[ptr++] = 8;
-					// indicate max volume
 					data[ptr++] = 0xff;
-					ptr++;
+					data[ptr++] = 2;
 					data[ptr++] = 0xff;
-					ptr++;
+					data[ptr++] = 4;
 					data[ptr++] = 0xff;
-					ptr++;
+					data[ptr++] = 8;
 					data[ptr++] = 0xff;
 			}
 
@@ -1383,6 +1379,9 @@ void t10mmc::WriteData( uint8_t *data, int dataLength )
 				m_device->logerror("Ch 1 route: %x vol: %x\n", data[10], data[11]);
 				m_device->logerror("Ch 2 route: %x vol: %x\n", data[12], data[13]);
 				m_device->logerror("Ch 3 route: %x vol: %x\n", data[14], data[15]);
+
+				// TODO: CDDA audio channels and output port should be separate
+				// The actual audio channel that gets sent to the output port is configurable and more than one audio channel can go to an output port
 				m_cdda->set_output_gain(0, data[9] / 255.0f);
 				m_cdda->set_output_gain(1, data[11] / 255.0f);
 				break;

diff --git a/src/mame/galaxian/galaxian.cpp b/src/mame/galaxian/galaxian.cpp
@@ -16328,7 +16328,7 @@ GAME( 1981, pacmanblc,   puckman,  pacmanbl,   pacmanbl,   galaxian_state, init_
 GAME( 1981, pacmanblci,  puckman,  pacmanbl,   pacmanbl,   galaxian_state, init_pacmanbl,   ROT270, "bootleg (Cirsa)",              "Pac-Man (Cirsa, Spanish bootleg on Galaxian hardware)",      MACHINE_SUPPORTS_SAVE )
 GAME( 199?, komemokos,   puckman,  pacmanbl,   pacmanbl,   galaxian_state, init_pacmanbl,   ROT270, "hack",                         "Komemokos (hack of 'Pac-Man (Cirsa, Spanish bootleg)')",     MACHINE_SUPPORTS_SAVE )
 GAME( 1981, pacmanblv,   puckman,  pacmanbl,   pacmanbl,   galaxian_state, init_pacmanbl,   ROT270, "bootleg (Video Dens)",         "Pac-Man (Video Dens, Spanish bootleg on Galaxian hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, crazym,      puckman,  galaxian,   pacmanblb,  galaxian_state, init_crazym,     ROT90,  "bootleg (GAT)",                "Crazy Mazey",                                                MACHINE_SUPPORTS_SAVE )
+GAME( 1982, crazym,      puckman,  galaxian,   pacmanblb,  galaxian_state, init_crazym,     ROT90,  "bootleg (Game-A-Tron)",        "Crazy Mazey",                                                MACHINE_SUPPORTS_SAVE )
 GAME( 1981, ghostmun,    puckman,  pacmanbl,   streakng,   galaxian_state, init_ghostmun,   ROT90,  "bootleg (Leisure and Allied)", "Ghost Muncher",                                              MACHINE_SUPPORTS_SAVE )
 GAME( 1981, phoenxp2,    phoenix,  pisces,     phoenxp2,   pisces_state,   init_batman2,    ROT270, "bootleg",                      "Phoenix Part 2",                                             MACHINE_SUPPORTS_SAVE )
 GAME( 1981, batman2,     phoenix,  pisces,     batman2,    pisces_state,   init_batman2,    ROT270, "bootleg",                      "Batman Part 2",                                              MACHINE_SUPPORTS_SAVE ) // Similar to pisces, but with different video banking characteristics

diff --git a/src/mame/sega/sega_beena.cpp b/src/mame/sega/sega_beena.cpp
@@ -2229,4 +2229,4 @@ ROM_END
 
 //    year, name,     parent, compat, machine,       input,      class,            init,       company, fullname,              flags
 CONS( 2005, beena,    0,      0,      sega_beena,    sega_beena, sega_beena_state, empty_init, "Sega",  "Advanced Pico BEENA", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_TIMING|MACHINE_IMPERFECT_SOUND )
-CONS( 2005, tvochken, 0,      0,      sega_9h0_0008, tvochken,   tvochken_state,   empty_init, "Sega",  "TV Ocha-Ken",         MACHINE_REQUIRES_ARTWORK|MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_TIMING|MACHINE_IMPERFECT_SOUND )
+CONS( 2005, tvochken, 0,      0,      sega_9h0_0008, tvochken,   tvochken_state,   empty_init, "Sega",  "TV Ocha-Ken",         MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_TIMING|MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/taito/taito_o.cpp b/src/mame/taito/taito_o.cpp
@@ -287,7 +287,7 @@ static INPUT_PORTS_START( parentj )
 	// dip descriptions and defaults taken from dip sheet
 	// NOTE: bit 0 = loc 8, bit 7 = loc 1
 	PORT_START("DSWA")
-	PORT_DIPNAME(0x01, 0x00, "Credits at start") PORT_DIPLOCATION("DSWA:8")
+	PORT_DIPNAME(0x01, 0x01, "Credits at start") PORT_DIPLOCATION("DSWA:8")
 	PORT_DIPSETTING(   0x00, "500" )
 	PORT_DIPSETTING(   0x01, "0" )
 	PORT_DIPNAME(0x02, 0x02, "Key Up / Clear")   PORT_DIPLOCATION("DSWA:7")