Merge tag 'mame0268' into rel268

MAME 0.268

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="267"
-      android:versionName="0.267"
+      android:versionCode="268"
+      android:versionName="0.268"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

docs/source/conf.py

@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.267'
+version = '0.268'
 # The full version, including alpha/beta/rc tags.
-release = '0.267'
+release = '0.268'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

hash/fp1100_cass.xml

@@ -10,7 +10,7 @@ TODO:
 -->
 <softwarelist name="fp1100_cass" description="Casio FP-1100 cassettes">
 	<software name="aliengya" supported="no">
-		<description>Alien No Gyakushu</description>
+		<description>Alien no Gyakushū</description>
 		<year>1983?</year>
 		<publisher>Compac</publisher>
 		<!-- TODO: Denoting wrong snippet -->
@@ -37,7 +37,7 @@ RUN
 WIDTH 40
 LOADM "CAS0:",R
 ]]></notes>
-		<info name="alt_title" value="アタックシーモンスタ"/>
+		<info name="alt_title" value="アタックシーモンスター"/>
 		<info name="serial" value="C-1001"/>
 		<part name="cass1" interface="fp1100_cass">
 			<dataarea name="cass" size="6191452">

hash/ibm5170_cdrom.xml

@@ -7354,7 +7354,7 @@ Wave Studio v3.12
 			</diskarea>
 		</part>
 	</software>
-	
+
 	<software name="ultrasnd" supported="partial">
 		<!-- includes Gravis UltraSound (GUS) Installation - V4.11 -->
 		<description>The UltraSound CD</description>

hash/megaduck.xml

@@ -112,7 +112,7 @@ license:CC0-1.0
 			</dataarea>
 		</part>
 	</software>
-	
+
 	<!-- for the Super Computer / Learn Computer version of the Mega Duck, has custom banking -->
 	<software name="bildrlex" supported="no" >
 		<description>Bilder Lexikon</description>
@@ -124,7 +124,7 @@ license:CC0-1.0
 				<rom name="bilder_lexikon.bin" size="0x80000" crc="7c277223" sha1="c91f0141a06c2dbf0883303779c3b7cba09722a8" />
 			</dataarea>
 		</part>
-	</software>	
+	</software>
 
 	<software name="captkk">
 		<description>Captain Knick Knack</description>

hash/spectrum_cass.xml

@@ -164427,7 +164427,7 @@ Side B - Game 1: Cauldron II: The Pumpkin Strikes Back (Palace Software)
 Side B - Game 2: Quazatron (Hewson Consultants)
 Side B - Game 3: Strike Force Cobra (Piranha)
 ]]></notes>
-	
+
 		<part name="cass1" interface="spectrum_cass">
 			<dataarea name="cass" size="134771">
 				<rom name="five star games 2 - side a.tzx" size="134771" crc="fcaef142" sha1="45941de1ad9817ae2b59621d89a824a5d2d0bfd9"/>

makefile

@@ -1578,7 +1578,7 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.267"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.268"' > $@
 	@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1588,7 +1588,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.267" > $@
+	@echo #define BARE_BUILD_VERSION "0.268" > $@
 	@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
 	@echo extern const char bare_build_version[]; >> $@
 	@echo extern const char bare_vcs_revision[]; >> $@

scripts/src/sound.lua

@@ -235,20 +235,6 @@ if (SOUNDS["ES1373"]~=null) then
 	}
 end
 
----------------------------------------------------
--- Data East custom sound chips
---@src/devices/sound/bsmt2000.h,SOUNDS["BSMT2000"] = true
----------------------------------------------------
-
-if (SOUNDS["BSMT2000"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/sound/bsmt2000.cpp",
-		MAME_DIR .. "src/devices/sound/bsmt2000.h",
-	}
-end
-
-
-
 ---------------------------------------------------
 -- Ensoniq 5503 (Apple IIgs)
 --@src/devices/sound/es5503.h,SOUNDS["ES5503"] = true
@@ -262,7 +248,6 @@ if (SOUNDS["ES5503"]~=null) then
 end
 
 
-
 ---------------------------------------------------
 -- Ensoniq 5505/5506
 --@src/devices/sound/es5506.h,SOUNDS["ES5505"] = true
@@ -289,6 +274,20 @@ if (SOUNDS["ESQPUMP"]~=null) then
 end
 
 
+---------------------------------------------------
+-- Data East custom sound chips
+--@src/devices/sound/bsmt2000.h,SOUNDS["BSMT2000"] = true
+---------------------------------------------------
+
+if (SOUNDS["BSMT2000"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/sound/bsmt2000.cpp",
+		MAME_DIR .. "src/devices/sound/bsmt2000.h",
+	}
+end
+
+
+
 ---------------------------------------------------
 -- Excellent Systems ADPCM sound chip
 --@src/devices/sound/es8712.h,SOUNDS["ES8712"] = true
@@ -1624,26 +1623,26 @@ if (SOUNDS["XT446"]~=null) then
 end
 
 ---------------------------------------------------
--- Roland LP-based sample players
---@src/devices/sound/roland_lp.h,SOUNDS["ROLANDLP"] = true
+-- Roland GP-based sample players
+--@src/devices/sound/roland_gp.h,SOUNDS["ROLANDGP"] = true
 ---------------------------------------------------
 
-if (SOUNDS["ROLANDLP"]~=null) then
+if (SOUNDS["ROLANDGP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/roland_lp.cpp",
-		MAME_DIR .. "src/devices/sound/roland_lp.h",
+		MAME_DIR .. "src/devices/sound/roland_gp.cpp",
+		MAME_DIR .. "src/devices/sound/roland_gp.h",
 	}
 end
 
 ---------------------------------------------------
--- Roland GP-based sample players
---@src/devices/sound/roland_gp.h,SOUNDS["ROLANDGP"] = true
+-- Roland LP-based sample players
+--@src/devices/sound/roland_lp.h,SOUNDS["ROLANDLP"] = true
 ---------------------------------------------------
 
-if (SOUNDS["ROLANDGP"]~=null) then
+if (SOUNDS["ROLANDLP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/roland_gp.cpp",
-		MAME_DIR .. "src/devices/sound/roland_gp.h",
+		MAME_DIR .. "src/devices/sound/roland_lp.cpp",
+		MAME_DIR .. "src/devices/sound/roland_lp.h",
 	}
 end
 

src/devices/bus/hp_dio/hp98620.cpp

@@ -37,7 +37,6 @@ class dio16_98620_device :
 
 	void irq_w(int state);
 
-	int m_icount;
 private:
 
 	static constexpr int REG0_RESET_ARM_INT = 0x00;
@@ -104,9 +103,10 @@ class dio16_98620_device :
 	void update_ctrl(const int channel, const uint16_t data, const bool is_1tq4);
 
 	bool     m_installed_io;
+	int      m_icount;
 	uint8_t  m_control;
 	uint8_t  m_data;
-	bool m_irq_state;
+	bool     m_irq_state;
 
 	struct dma_regs {
 		uint32_t address = 0;
@@ -139,8 +139,8 @@ dio16_98620_device::dio16_98620_device(const machine_config &mconfig, device_typ
 	device_t{mconfig, type, tag, owner, clock},
 	device_execute_interface{mconfig, *this},
 	device_dio16_card_interface{mconfig, *this},
-	m_icount{0},
 	m_installed_io{false},
+	m_icount{0},
 	m_control{0},
 	m_data{0},
 	m_irq_state{false},
@@ -439,8 +439,9 @@ bool dio16_98620_device::dma_transfer(int channel)
 	if (!m_dmar[channel])
 		return false;
 
-	LOG("dma_transfer %s: tc %d/%d\n", m_regs[channel].dma_out ? "out" : "in",
-	    m_regs[channel].tc, m_regs[channel].subcount);
+	LOG("dma_transfer %s: tc %d/%d\n",
+			m_regs[channel].dma_out ? "out" : "in",
+			m_regs[channel].tc, m_regs[channel].subcount);
 
 	if (m_regs[channel].dma_out) {
 			dmack_w_out(channel, program_space().read_byte(m_regs[channel].address++));

src/devices/bus/ieee488/hp9133.cpp

@@ -28,7 +28,7 @@
 namespace {
 
 class hp9133_device : public device_t,
-		      public device_ieee488_interface
+			  public device_ieee488_interface
 {
 public:
 	// construction/destruction
@@ -534,11 +534,11 @@ void hp9133_device::io1_w(uint8_t data)
 	// 0 - Fault LED#
 	m_head = (data >> 2) & 7;
 	LOG("%s: %02x Head %d %s%s%s%s\n", __func__,
-	    	data, m_head,
-	    	(data & IO1_W_BRDY) ? "BRDY " : "",
-	    	(data & IO1_W_WDRESET_N) ? "" : "HDCRESET ",
-	    	(data & IO1_W_DS1) ? "ACTIVE " : "",
-	    	(data & IO1_W_FLT_N) ? "" : "FAULT ");
+			data, m_head,
+			(data & IO1_W_BRDY) ? "BRDY " : "",
+			(data & IO1_W_WDRESET_N) ? "" : "HDCRESET ",
+			(data & IO1_W_DS1) ? "ACTIVE " : "",
+			(data & IO1_W_FLT_N) ? "" : "FAULT ");
 	if (!(data & IO1_W_WDRESET_N))
 		m_hdc->reset();
 	m_hdc->buffer_ready(data & IO1_W_BRDY);
@@ -590,8 +590,8 @@ void hp9133_device::io3_w(uint8_t data)
 	m_intsel = data & IO3_W_INTSEL_MASK;
 
 	LOG("%s: %02x = INTSEL %d, INT %d DMA %d DMA start %d DMA ACK %s\n", __func__,
-	    	data, m_intsel, m_intenable, m_dmaenable, BIT(data, 4),
-	    	m_dmaack_switch ? "GPIB" : "FDC");
+			data, m_intsel, m_intenable, m_dmaenable, BIT(data, 4),
+			m_dmaack_switch ? "GPIB" : "FDC");
 	update_intsel();
 	if (m_fast)
 		m_fast_timer->adjust(attotime::from_usec(1000));
@@ -713,7 +713,7 @@ void hp9133_device::hdc_readwrite_sector(bool write)
 	const auto &info = m_harddisk->get_info();
 	lba = (m_hdc_cylinder * info.heads + m_head) * info.sectors + sector;
 	LOG("%s: %s cyl %4d, head %d, sector %2d lba %8d\n", __func__,
-	    write ? "WRITE" : "READ ", m_hdc_cylinder, m_head, sector, lba);
+			write ? "WRITE" : "READ ", m_hdc_cylinder, m_head, sector, lba);
 	if (write) {
 		m_harddisk->write(lba, m_dma_ram);
 	} else {

src/devices/bus/mc10/mcx128.cpp

@@ -53,7 +53,7 @@ ROM_START(mcx128)
 	ROMX_LOAD("mcx128bas.rom", 0x0000, 0x4000, CRC(11202e4b) SHA1(36c30d0f198a1bffee88ef29d92f2401447a91f4), ROM_BIOS(0))
 
 	ROM_SYSTEM_BIOS(1, "alice", "Darren Atkinson's MCX-128 cartridge for Alice")
-	ROMX_LOAD("alice128bas.rom", 0x0000, 0x4000, CRC(a737544a) SHA1(c8fd92705fc42deb6a0ffac6274e27fd61ecd4cc), ROM_BIOS(1))	
+	ROMX_LOAD("alice128bas.rom", 0x0000, 0x4000, CRC(a737544a) SHA1(c8fd92705fc42deb6a0ffac6274e27fd61ecd4cc), ROM_BIOS(1))
 ROM_END
 
 //**************************************************************************

src/devices/cpu/z80/r800.cpp

@@ -48,9 +48,9 @@ DEFINE_DEVICE_TYPE(R800, r800_device, "r800", "ASCII R800")
 r800_device::r800_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
 	: z80_device(mconfig, R800, tag, owner, clock)
 {
-    z80_set_m1_cycles(1);
-    z80_set_memrq_cycles(1);
-    z80_set_iorq_cycles(1);
+	z80_set_m1_cycles(1);
+	z80_set_memrq_cycles(1);
+	z80_set_iorq_cycles(1);
 }
 
 std::unique_ptr<util::disasm_interface> r800_device::create_disassembler()

src/devices/sound/imaadpcm.cpp

@@ -116,7 +116,7 @@ void ima_adpcm_state::compute_tables()
 		// compute the step value
 		int stepval = std::min(floor(16.0 * pow(11.0 / 10.0, (double)step)), 32767.);
 
-        // manual correction of some early values
+		// manual correction of some early values
 		if (step == -5 || step == -4)
 			stepval++;
 

src/devices/sound/roland_gp.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:giulioz
-#ifndef MAME_SOUND_ROLANDGP_H
-#define MAME_SOUND_ROLANDGP_H
+#ifndef MAME_SOUND_ROLAND_GP_H
+#define MAME_SOUND_ROLAND_GP_H
 
 #pragma once
 
@@ -10,6 +10,8 @@
 class tc6116_device : public device_t, public device_sound_interface, public device_rom_interface<23>
 {
 public:
+	static constexpr feature_type unemulated_features() { return feature::SOUND; }
+
 	tc6116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	auto int_callback() { return m_int_callback.bind(); }
@@ -74,11 +76,11 @@ class tc6116_device : public device_t, public device_sound_interface, public dev
 
 	uint32_t m_clock;                   // clock
 	uint32_t m_rate;                    // sample rate (usually 32000 Hz)
-	sound_stream* m_stream;             // stream handle
+	sound_stream *m_stream;             // stream handle
 	pcm_channel m_chns[NUM_CHANNELS];   // channel memory
 	[[maybe_unused]] uint8_t m_sel_chn; // selected channel
 };
 
 DECLARE_DEVICE_TYPE(TC6116, tc6116_device)
 
-#endif // MAME_SOUND_ROLANDGP_H
+#endif // MAME_SOUND_ROLAND_GP_H

src/devices/sound/roland_lp.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Valley Bell
-#ifndef MAME_SOUND_ROLANDLP_H
-#define MAME_SOUND_ROLANDLP_H
+#ifndef MAME_SOUND_ROLAND_LP_H
+#define MAME_SOUND_ROLAND_LP_H
 
 #pragma once
 
@@ -66,4 +66,4 @@ class mb87419_mb87420_device : public device_t, public device_sound_interface, p
 
 DECLARE_DEVICE_TYPE(MB87419_MB87420, mb87419_mb87420_device)
 
-#endif // MAME_SOUND_ROLANDLP_H
+#endif // MAME_SOUND_ROLAND_LP_H

src/frontend/mame/ui/selmenu.cpp

@@ -1923,7 +1923,11 @@ bool menu_select_launch::handle_keys(u32 flags, int &iptkey)
 
 	if (exclusive_input_pressed(iptkey, IPT_UI_CANCEL, 0))
 	{
-		if (!m_search.empty())
+		if (m_ui_error)
+		{
+			// dismiss error
+		}
+		else if (!m_search.empty())
 		{
 			// escape pressed with non-empty search text clears it
 			m_search.clear();
@@ -1945,7 +1949,12 @@ bool menu_select_launch::handle_keys(u32 flags, int &iptkey)
 	// accept left/right keys as-is with repeat
 	if (exclusive_input_pressed(iptkey, IPT_UI_LEFT, (flags & PROCESS_LR_REPEAT) ? 6 : 0))
 	{
-		if (m_focus == focused_menu::RIGHTTOP)
+		if (m_ui_error)
+		{
+			// dismiss error
+			return false;
+		}
+		else if (m_focus == focused_menu::RIGHTTOP)
 		{
 			// Swap the right panel and swallow it
 			iptkey = IPT_INVALID;
@@ -1976,7 +1985,12 @@ bool menu_select_launch::handle_keys(u32 flags, int &iptkey)
 	// swallow left/right keys if they are not appropriate
 	if (exclusive_input_pressed(iptkey, IPT_UI_RIGHT, (flags & PROCESS_LR_REPEAT) ? 6 : 0))
 	{
-		if (m_focus == focused_menu::RIGHTTOP)
+		if (m_ui_error)
+		{
+			// dismiss error
+			return false;
+		}
+		else if (m_focus == focused_menu::RIGHTTOP)
 		{
 			// Swap the right panel and swallow it
 			iptkey = IPT_INVALID;

src/mame/apple/macquadra700.cpp

@@ -830,7 +830,7 @@ void eclipse_state::via2_out_b_q900(u8 data)
 
 		SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd");
 		SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68040");
-	//	SOFTWARE_LIST(config, "cd_apple_dev").set_original("apple_devcd");
+		//SOFTWARE_LIST(config, "cd_apple_dev").set_original("apple_devcd");
 		SOFTWARE_LIST(config, "flop_mac35_orig").set_original("mac_flop_orig");
 		SOFTWARE_LIST(config, "flop_mac35_clean").set_original("mac_flop_clcracked");
 		SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");