y-ack · y-ack · Nov 25, 2023 · Nov 25, 2023 · Nov 25, 2023 · Nov 25, 2023
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/docs/source/techspecs/layout_files.rst b/docs/source/techspecs/layout_files.rst
@@ -1461,33 +1461,36 @@ Example layout files
 These layout files demonstrate various artwork system features.  They are all
 internal layouts included in MAME.
 
-`sstrangr.lay <https://git.redump.net/mame/tree/src/mame/layout/sstrangr.lay?h=mame0235>`_
+`sstrangr.lay <https://git.redump.net/mame/tree/src/mame/layout/sstrangr.lay?h=mame0261>`_
     A simple case of using translucent colour overlays to visually separate and
     highlight elements on a black and white screen.
-`seawolf.lay <https://git.redump.net/mame/tree/src/mame/layout/seawolf.lay?h=mame0235>`_
+`seawolf.lay <https://git.redump.net/mame/tree/src/mame/layout/seawolf.lay?h=mame0261>`_
     This system uses lamps for key gameplay elements.  Blending modes are used
     for the translucent colour overlay placed over the monitor, and the lamps
     reflected in front of the monitor.  Also uses collections to allow parts of
     the layout to be disabled selectively.
-`armora.lay <https://git.redump.net/mame/tree/src/mame/layout/armora.lay?h=mame0235>`_
+`armora.lay <https://git.redump.net/mame/tree/src/mame/layout/armora.lay?h=mame0261>`_
     This game’s monitor is viewed directly through a translucent colour overlay
     rather than being reflected from inside the cabinet.  This means the overlay
     reflects ambient light as well as affecting the colour of the video image.
     The shapes on the overlay are drawn using embedded SVG images.
-`tranz330.lay <https://git.redump.net/mame/tree/src/mame/layout/tranz330.lay?h=mame0235>`_
+`tranz330.lay <https://git.redump.net/mame/tree/src/mame/layout/tranz330.lay?h=mame0261>`_
     A multi-segment alphanumeric display and keypad.  The keys are clickable,
     and provide visual feedback when pressed.
-`esq2by16.lay <https://git.redump.net/mame/tree/src/mame/layout/esq2by16.lay?h=mame0235>`_
+`esq2by16.lay <https://git.redump.net/mame/tree/src/mame/layout/esq2by16.lay?h=mame0261>`_
     Builds up a multi-line dot matrix character display.  Repeats are used to
     avoid repetition for the rows in a character, characters in a line, and
     lines in a page.  Group colors allow a single element to be used for all
     four display colours.
-`cgang.lay <https://git.redump.net/mame/tree/src/mame/layout/cgang.lay?h=mame0235>`_
+`cgang.lay <https://git.redump.net/mame/tree/src/mame/layout/cgang.lay?h=mame0261>`_
     Animates the position of element items to simulate an electromechanical
     shooting gallery game.  Also demonstrates effective use of components to
     build up complex graphics.
-`unkeinv.lay <https://git.redump.net/mame/tree/src/mame/layout/unkeinv.lay?h=mame0235>`_
+`minspace.lay <https://git.redump.net/mame/tree/src/mame/layout/minspace.lay?h=mame0261>`_
     Shows the position of a slider control with LEDs on it.
-`md6802.lay <https://git.redump.net/mame/tree/src/mame/layout/md6802.lay?h=mame0235>`_
+`md6802.lay <https://git.redump.net/mame/tree/src/mame/layout/md6802.lay?h=mame0261>`_
     Effectively using groups as a procedural programming language to build up an
     image of a trainer board.
+`beena.lay <https://git.redump.net/mame/tree/src/mame/layout/beena.lay?h=mame0261>`_
+    Using event-based scripting to dynamically position elements and draw elemnt
+    content programmatically.
diff --git a/hash/casio_rompack.xml b/hash/casio_rompack.xml
@@ -420,7 +420,7 @@ license:CC0-1.0
 	    3 I Left My Heart In San Francisco
 	    4 Memories Of You
 	  The earlier (1984) edition of this pack is labelled "Jazz Standards" while the later (1986) edition is "Great Standards."
-	  There are apparently no other differences between the editions. 
+	  There are apparently no other differences between the editions.
 	-->
 	<software name="ro355" supported="no">
 		<description>Great Standards (RO-355)</description>

diff --git a/hash/cz1_cart.xml b/hash/cz1_cart.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<!--
+license:CC0-1.0
+-->
+<softwarelist name="cz1_cart" description="Casio CZ-1 ROM cartridges">
+
+	<software name="rc10">
+		<description>Orchestra (RC-10)</description>
+		<year>1986</year>
+		<publisher>Casio</publisher>
+		<info name="serial" value="RC-10" />
+		<part name="cart" interface="cz_cart">
+			<dataarea name="rom" size="0x8000">
+				<rom name="casio_cz1_cartridge_rc10.bin" size="0x8000" crc="d1f1c6a6" sha1="c97c8f101d76142b400fa6c466e5d3546d33eea9" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="rc20">
+		<description>Piano / Guitar / Percussion (RC-20)</description>
+		<year>1986</year>
+		<publisher>Casio</publisher>
+		<info name="serial" value="RC-20" />
+		<part name="cart" interface="cz_cart">
+			<dataarea name="rom" size="0x4000"> <!-- restored from a sysex dump -->
+				<rom name="rc20.bin" size="0x4000" crc="237a2516" sha1="d1d697fbca0e16a07fa6d2710d2f7327cae81704" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="rc30">
+		<description>Organ / Synth. Sound / Sound Effect (RC-30)</description>
+		<year>1986</year>
+		<publisher>Casio</publisher>
+		<info name="serial" value="RC-30" />
+		<part name="cart" interface="cz_cart">
+			<dataarea name="rom" size="0x8000">
+				<rom name="casio_cz1_cartridge_rc30.bin" size="0x8000" crc="3a88d634" sha1="0acfded6b4b66664f1720f3cd4b47609887fc843" />
+			</dataarea>
+		</part>
+	</software>
+
+</softwarelist>
diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml
@@ -3021,7 +3021,7 @@ Terminal Velocity: incompatible with Windows 95 (verify), has unsupported option
 		<description>Dune II - Battle for Arrakis (Netherlands)</description>
 		<year>1995</year>
 		<publisher>Hit Squad</publisher>
-		<info name="developer" value=" 	Westwood Studios" />
+		<info name="developer" value="Westwood Studios" />
 		<info name="language" value="English/French/German" />
 		<info name="region" value="Netherlands" />
 		<info name="version" value="V1.07" />
@@ -3041,7 +3041,7 @@ Terminal Velocity: incompatible with Windows 95 (verify), has unsupported option
 		<description>Dune II - Battle for Arrakis (Germany, PC Games Collection 2 release)</description>
 		<year>2001</year>
 		<publisher>Electronic Arts / Infogrames</publisher>
-		<info name="developer" value=" 	Westwood Studios" />
+		<info name="developer" value="Westwood Studios" />
 		<info name="language" value="English/French/German" />
 		<info name="version" value="V1.07" />
 		<sharedfeat name="platform" value="DOS" />
@@ -3060,7 +3060,7 @@ Terminal Velocity: incompatible with Windows 95 (verify), has unsupported option
 		<description>Dune II - The Building of a Dynasty (USA, Gold Medal 12 CD Pack)</description>
 		<year>1995</year>
 		<publisher>Virgin Games</publisher>
-		<info name="developer" value=" 	Westwood Studios" />
+		<info name="developer" value="Westwood Studios" />
 		<info name="language" value="English" />
 		<info name="region" value="USA" />
 		<info name="version" value="V1.07" />
@@ -5403,6 +5403,26 @@ Warlords III: Darklords Rising
 		</part>
 	</software>
 
+	<!-- DOS -->
+	<!-- 4MB, 8MB and 16MB versions known to exist (?) -->
+	<!-- Win / Mac later release known to exist -->
+	<software name="primrage" supported="partial">
+		<description>Primal Rage (USA, DOS)</description>
+		<year>1994</year>
+		<publisher>Time Warner Interactive</publisher>
+		<notes><![CDATA[
+Detects 4MB even if there are 16MB [RAM] installed (verify claim on wiki, this may be 4MB version)
+[SVGA] S3 (at least) runs game at 70 Hz
+https://www.pcgamingwiki.com/wiki/Primal_Rage
+]]></notes>
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="timewarnerinteractive-primalrage-msdos-eng" sha1="c3e4c2d2ceebe80975d61c6761542dc180031520"/>
+			</diskarea>
+		</part>
+	</software>
+
+
 	<!-- Windows 3.1J / 95J -->
 	<!-- English prototype known to exist -->
 	<software name="prinmak2">

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
@@ -23910,7 +23910,7 @@ Side B: Laser Shoot (original release)
 			</dataarea>
 		</part>
 		<part name="cass2" interface="spectrum_cass">
-			<feature name="part_id" value="128K"/>			
+			<feature name="part_id" value="128K"/>
 			<dataarea name="cass" size="64323">
 				<rom name="RetroForce(128K).tap" size="64323" crc="c1c7cf3e" sha1="32ef8497ac652b9166ebbb4d8bd05dc85ebe9164"/>
 			</dataarea>
@@ -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[
@@ -139449,7 +139449,7 @@ Nothing happens after loading the cassette
 	<software name="teodoro_ru" cloneof="teodoro">
 		<description>Teodoro no Sabe Volar (Russian, TAP tape image)</description>
 		<year>2010</year>
-		<publisher>Retroworks</publisher>	
+		<publisher>Retroworks</publisher>
 		<info name="language" value="Russian" />
 		<part name="cass" interface="spectrum_cass">
 			<dataarea name="cass" size="45440">

diff --git a/hash/zx81_cass.xml b/hash/zx81_cass.xml
@@ -245,15 +245,15 @@ Known dumps not yet added (as of 2023-06-14):
 
 	<software name="8progs">
 		<!--
-			Programs included:
-			- FAI             LOAD "A"
-			- Geodrifter      LOAD "B"
-			- RA+DEC          LOAD "C"
-			- Moontrack       LOAD "D"
-			- Yankee Clipper  LOAD "E"
-			- Tensat          LOAD "F"
-			- Oscar10         LOAD "G"
-			- TenPlan         LOAD "H"
+		    Programs included:
+		    - FAI             LOAD "A"
+		    - Geodrifter      LOAD "B"
+		    - RA+DEC          LOAD "C"
+		    - Moontrack       LOAD "D"
+		    - Yankee Clipper  LOAD "E"
+		    - Tensat          LOAD "F"
+		    - Oscar10         LOAD "G"
+		    - TenPlan         LOAD "H"
 		-->
 		<description>8 Programmes by GM4IHJ</description>
 		<year>198?</year>

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 " (" 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/scripts/src/cpu.lua b/scripts/src/cpu.lua
@@ -3911,10 +3911,17 @@ if opt_tool(CPUS, "EVOLUTION") then
 end
 
 --------------------------------------------------
--- Tensilica Xtensa, disassembler only
+-- Tensilica Xtensa
 --@src/devices/cpu/xtensa/xtensa.h,CPUS["XTENSA"] = true
 --------------------------------------------------
 
+if CPUS["XTENSA"] then
+	files {
+		MAME_DIR .. "src/devices/cpu/xtensa/xtensa.cpp",
+		MAME_DIR .. "src/devices/cpu/xtensa/xtensa.h",
+	}
+end
+
 if opt_tool(CPUS, "XTENSA") then
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/xtensa/xtensad.cpp")
 	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/xtensa/xtensad.h")

diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
@@ -2652,6 +2652,18 @@ if (MACHINES["MSM58321"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/machine/msm6200.h,MACHINES["MSM6200"] = true
+---------------------------------------------------
+
+if (MACHINES["MSM6200"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/msm6200.cpp",
+		MAME_DIR .. "src/devices/machine/msm6200.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/machine/msm6242.h,MACHINES["MSM6242"] = true
@@ -2988,7 +3000,6 @@ if (MACHINES["PXA255"]~=null) then
 	files {
 		MAME_DIR .. "src/devices/machine/pxa255.cpp",
 		MAME_DIR .. "src/devices/machine/pxa255.h",
-		MAME_DIR .. "src/devices/machine/pxa255defs.h",
 	}
 end
 

diff --git a/src/devices/bus/odyssey2/chess.h b/src/devices/bus/odyssey2/chess.h
@@ -44,12 +44,12 @@ class o2_chess_device : public device_t,
 	required_device<cpu_device> m_maincpu;
 	required_device_array<generic_latch_8_device, 2> m_latch;
 
+	u8 m_control = 0;
+
 	u8 internal_rom_r(offs_t offset) { return m_exrom[offset]; }
 
 	void chess_io(address_map &map);
 	void chess_mem(address_map &map);
-
-	u8 m_control = 0;
 };
 
 // device type definition

diff --git a/src/devices/bus/odyssey2/homecomp.h b/src/devices/bus/odyssey2/homecomp.h
@@ -49,16 +49,16 @@ class o2_homecomp_device : public device_t,
 	required_device_array<generic_latch_8_device, 2> m_latch;
 	required_device<cassette_image_device> m_cass;
 
+	std::unique_ptr<u8[]> m_ram;
+	u8 m_control = 0;
+	bool m_installed = false;
+
 	void internal_io_w(offs_t offset, u8 data);
 	u8 internal_io_r(offs_t offset);
 	u8 internal_rom_r(offs_t offset) { return m_exrom[offset]; }
 
 	void homecomp_io(address_map &map);
 	void homecomp_mem(address_map &map);
-
-	std::unique_ptr<u8[]> m_ram;
-	u8 m_control = 0;
-	bool m_installed = false;
 };
 
 // device type definition

diff --git a/src/devices/bus/saitek_osa/expansion.h b/src/devices/bus/saitek_osa/expansion.h
@@ -88,15 +88,15 @@ class saitekosa_expansion_device : public device_t, public device_single_card_sl
 	devcb_write_line m_stb_handler;
 	devcb_write_line m_rts_handler;
 
-	u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
 	// input pins state
 	u8 m_data = 0;
 	int m_nmi = 0;
 	int m_ack = 0;
 	int m_pw = 0;
 
 	device_saitekosa_expansion_interface *m_module;
+
+	u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 };
 
 // ======================> device_saitekosa_expansion_interface

diff --git a/src/devices/bus/saitek_osa/maestro.h b/src/devices/bus/saitek_osa/maestro.h
@@ -48,6 +48,10 @@ class saitekosa_maestro_device : public device_t, public device_saitekosa_expans
 	required_memory_bank m_rombank;
 	required_device<generic_slot_device> m_extrom;
 
+	u8 m_latch = 0xff;
+	bool m_latch_enable = false;
+	u8 m_extrom_bank = 0;
+
 	virtual void main_map(address_map &map);
 
 	u8 extrom_r(offs_t offset);
@@ -59,10 +63,6 @@ class saitekosa_maestro_device : public device_t, public device_saitekosa_expans
 	void control_w(u8 data);
 
 	void set_cpu_freq();
-
-	u8 m_latch = 0xff;
-	bool m_latch_enable = false;
-	u8 m_extrom_bank = 0;
 };
 
 class saitekosa_analyst_device : public saitekosa_maestro_device

diff --git a/src/devices/bus/saitek_osa/maestroa.h b/src/devices/bus/saitek_osa/maestroa.h
@@ -39,6 +39,9 @@ class saitekosa_maestroa_device : public device_t, public device_saitekosa_expan
 private:
 	required_device<cpu_device> m_maincpu;
 
+	u8 m_latch = 0xff;
+	bool m_latch_enable = false;
+
 	void main_map(address_map &map);
 
 	u8 rts_r();
@@ -48,9 +51,6 @@ class saitekosa_maestroa_device : public device_t, public device_saitekosa_expan
 	void control_w(u8 data);
 
 	void set_cpu_freq();
-
-	u8 m_latch = 0xff;
-	bool m_latch_enable = false;
 };