Merge remote-tracking branch 'upstream/master'

Author: Robbbert

hash/apple2gs_flop_misc.xml

@@ -5824,6 +5824,7 @@ Generated by SLIST 0.1
 		<description>System Software v1.1</description>
 		<year>1986</year>
 		<publisher>Apple Computer, Inc.</publisher>
+		<info name="alt_title" value="ProDOS 16 v1.1" />
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="819264">
@@ -5836,6 +5837,7 @@ Generated by SLIST 0.1
 		<description>System Software v3.1</description>
 		<year>1987</year>
 		<publisher>Apple Computer, Inc.</publisher>
+		<info name="alt_title" value="ProDOS 16 v1.3" />
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="819264">
@@ -5846,8 +5848,9 @@ Generated by SLIST 0.1
 
 	<software name="sys32">
 		<description>System Software v3.2</description>
-		<year>1987</year>
+		<year>1988</year>
 		<publisher>Apple Computer, Inc.</publisher>
+		<info name="alt_title" value="ProDOS 16 v1.6" />
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="819264">
@@ -5860,6 +5863,7 @@ Generated by SLIST 0.1
 		<description>System Software v4.0</description>
 		<year>1988</year>
 		<publisher>Apple Computer, Inc.</publisher>
+		<info name="alt_title" value="GS/OS v02.00" />
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="819264">
@@ -5875,8 +5879,9 @@ Generated by SLIST 0.1
 
 	<software name="sys502">
 		<description>System Software v5.0.2</description>
-		<year>1989</year>
+		<year>1990</year>
 		<publisher>Apple Computer, Inc.</publisher>
+		<info name="alt_title" value="GS/OS v03.03" />
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="819200">
@@ -5894,6 +5899,7 @@ Generated by SLIST 0.1
 		<description>System Software v5.0.4</description>
 		<year>1990</year>
 		<publisher>Apple Computer, Inc.</publisher>
+		<info name="alt_title" value="GS/OS v03.03" />
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="819264">
@@ -5911,6 +5917,7 @@ Generated by SLIST 0.1
 		<description>System Software v6.0.1</description>
 		<year>1993</year>
 		<publisher>Apple Computer, Inc.</publisher>
+		<info name="alt_title" value="GS/OS v4.02" />
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="819264">

src/devices/bus/adamnet/fdc.cpp

@@ -90,8 +90,9 @@ void adam_fdc_device::adam_fdc_mem(address_map &map)
 	map(0x4800, 0x4800).mirror(0x3ff).r(WD2793_TAG, FUNC(wd2793_device::sector_r));
 	map(0x5800, 0x5800).mirror(0x3ff).w(WD2793_TAG, FUNC(wd2793_device::sector_w));
 	map(0x6800, 0x6800).mirror(0x3ff).r(WD2793_TAG, FUNC(wd2793_device::data_r));
-	map(0x6c00, 0x6fff).r(FUNC(adam_fdc_device::data_r));
+	map(0x6c00, 0x6fff).r(FUNC(adam_fdc_device::read_data_r));
 	map(0x7800, 0x7800).mirror(0x3ff).w(WD2793_TAG, FUNC(wd2793_device::data_w));
+	map(0x7c00, 0x7fff).r(FUNC(adam_fdc_device::write_data_r));
 	map(0x8000, 0x8fff).mirror(0x7000).rom().region(M6801_TAG, 0);
 }
 
@@ -198,14 +199,30 @@ void adam_fdc_device::adamnet_reset_w(int state)
 
 
 //-------------------------------------------------
-//  data_r -
+//  read_data_r -
 //-------------------------------------------------
 
-uint8_t adam_fdc_device::data_r(offs_t offset)
+uint8_t adam_fdc_device::read_data_r(offs_t offset)
 {
 	uint8_t data = m_fdc->data_r();
 
-	m_ram[offset & 0x3ff] = data;
+	if (!machine().side_effects_disabled())
+		m_ram[offset & 0x3ff] = data;
+
+	return data;
+}
+
+
+//-------------------------------------------------
+//  write_data_r -
+//-------------------------------------------------
+
+uint8_t adam_fdc_device::write_data_r(offs_t offset)
+{
+	uint8_t data = m_ram[offset & 0x3ff];
+
+	if (!machine().side_effects_disabled())
+		m_fdc->data_w(data);
 
 	return data;
 }

src/devices/bus/adamnet/fdc.h

@@ -53,7 +53,8 @@ class adam_fdc_device :  public device_t,
 
 	static void floppy_formats(format_registration &fr);
 
-	uint8_t data_r(offs_t offset);
+	uint8_t read_data_r(offs_t offset);
+	uint8_t write_data_r(offs_t offset);
 	uint8_t p1_r();
 	void p1_w(uint8_t data);
 	uint8_t p2_r();

src/devices/bus/isa/svga_paradise.h

@@ -139,7 +139,6 @@ class isa16_wd90c11_lr_device :
 	virtual void remap(int space_id, offs_t start, offs_t end) override;
 	void io_isa_map(address_map &map) ATTR_COLD;
 
-private:
 	required_device<wd90c11a_vga_device> m_vga;
 };
 

src/devices/bus/nes/namcot.cpp

@@ -23,7 +23,6 @@
 
 #include "emu.h"
 #include "namcot.h"
-#include "ui/uimain.h"
 
 #include "speaker.h"
 
@@ -567,7 +566,7 @@ void nes_namcot163_device::chr_w(offs_t offset, uint8_t data)
 	if (!(m_latch & 0x40) && m_chr_bank >= 0xe0)
 	{
 		// CIRAM!!!
-		machine().ui().popup_time(10, "CIRAM mapped to VRAM. Please contact MAMEDevs.");
+		logerror("CIRAM mapped to VRAM!\n");
 
 		if (!m_nt_writable[bank & 0x03])
 			return;
@@ -582,7 +581,7 @@ uint8_t nes_namcot163_device::chr_r(offs_t offset)
 	if (!(m_latch & 0x40) && m_chr_bank >= 0xe0)
 	{
 		// CIRAM!!!
-		machine().ui().popup_time(10, "CIRAM mapped to VRAM. Please contact MAMEDevs.");
+		logerror("CIRAM mapped to VRAM!\n");
 		return m_nt_access[bank & 0x03][offset & 0x3ff];
 	}
 	// or ROM, accessed as usual

src/devices/video/pc_vga_paradise.cpp

@@ -306,6 +306,7 @@ wd90c00_vga_device::wd90c00_vga_device(const machine_config &mconfig, device_typ
 	, m_cnf13_read_cb(*this, 1)
 	, m_cnf12_read_cb(*this, 1)
 	, m_cnf_write_ddr_cb(*this, 0xff)
+	, m_vclk2(0)
 {
 	m_crtc_space_config = address_space_config("crtc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(wd90c00_vga_device::crtc_map), this));
 }
@@ -315,6 +316,16 @@ wd90c00_vga_device::wd90c00_vga_device(const machine_config &mconfig, const char
 {
 }
 
+void wd90c00_vga_device::device_start()
+{
+	pvga1a_vga_device::device_start();
+	if (m_vclk2 == 0)
+	{
+		m_vclk2 = 42'000'000;
+		logerror("VCLK2 unset, using fallback to 42 MHz");
+	}
+}
+
 void wd90c00_vga_device::device_reset()
 {
 	pvga1a_vga_device::device_reset();
@@ -412,8 +423,9 @@ void wd90c00_vga_device::recompute_params()
 		case 2:
 		// TODO: wd90c30 selects this for 1024x768 interlace mode
 		// (~40 Hz, should be 43 according to defined video clocks in WD9710 driver .inf)
+		// NOTE: it's also reused by teradrive Video mode
 		default:
-			xtal = XTAL(42'000'000).value();
+			xtal = XTAL(m_vclk2).value();
 			break;
 	}
 

src/devices/video/pc_vga_paradise.h

@@ -67,9 +67,14 @@ class wd90c00_vga_device : public pvga1a_vga_device
 	ioport_value egasw3_r();
 	ioport_value egasw2_r();
 	ioport_value egasw1_r();
+
+	void set_vclk2(u32 freq) { m_vclk2 = freq; }
+	void set_vclk2(const XTAL &freq) { m_vclk2 = freq.value(); }
+
 protected:
 	wd90c00_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
+	virtual void device_start() override ATTR_COLD;
 	virtual void device_reset() override ATTR_COLD;
 
 	virtual void crtc_map(address_map &map) override ATTR_COLD;
@@ -108,6 +113,8 @@ class wd90c00_vga_device : public pvga1a_vga_device
 	devcb_read_line m_cnf13_read_cb;
 	devcb_read_line m_cnf12_read_cb;
 	devcb_read8     m_cnf_write_ddr_cb;
+
+	u32 m_vclk2;
 };
 
 class wd90c11a_vga_device : public wd90c00_vga_device

src/devices/video/ym7101.cpp

@@ -1193,6 +1193,7 @@ TIMER_CALLBACK_MEMBER(ym7101_device::dma_callback)
 		// TODO: rough estimation, should also take FIFO in consideration
 		// - galahad explicitly stops 68k by running DMAs during active scan
 		// - sailormn will hang during intro by side effect of checking sound busy without bus
+		// - zoom stage intros are timed against DMA (currently a bit too fast)
 		const bool in_active_display = !screen().vblank() && !in_hblank();
 
 		m_dma_timer->adjust(attotime::from_ticks(4 << (in_active_display + (code_dest == AS_VDP_VRAM)), clock()));

src/frontend/mame/ui/uicmd14.md

@@ -0,0 +1,4 @@
+# **uicmd14.png Icon sheet** #
+
+license:BSD-3-Clause\
+copyright-holders:Maurizio Petrarota