update

# Conflicts:
#	android-project/app/src/main/AndroidManifest.xml
#	docs/source/conf.py
#	makefile

Author: Robbbert

makefile

@@ -6,7 +6,7 @@
 #
 ###########################################################################
 
-BARE_VERS := 0.286
+BARE_VERS := 0.287
 LONG_VERS := $(BARE_VERS).x
 
 ###########################################################################

scripts/src/machine.lua

@@ -4169,6 +4169,19 @@ if MACHINES["X2212"] then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/machine/x28.h,MACHINES["X28"] = true
+---------------------------------------------------
+
+if MACHINES["X28"] then
+	files {
+		MAME_DIR .. "src/devices/machine/x28.cpp",
+		MAME_DIR .. "src/devices/machine/x28.ipp",
+		MAME_DIR .. "src/devices/machine/x28.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/machine/x76f041.h,MACHINES["X76F041"] = true

src/devices/bus/pci/sis6326.cpp

@@ -51,7 +51,8 @@ ROM_START( sis6326pci )
 	ROM_REGION32_LE( 0x10000, "bios", ROMREGION_ERASEFF )
 	ROM_DEFAULT_BIOS("sis")
 
-	ROM_SYSTEM_BIOS( 0, "sis", "SiS6326 4MB 1.25" )
+	// "12/07/1998-13:01:00" in BIOS header, assume in MM/DD/YYYY format
+	ROM_SYSTEM_BIOS( 0, "sis", "SiS6326 4MB 1.25 (12-07-98)" )
 	ROMX_LOAD( "sis6326_75mhz.vbi", 0x000000, 0x008000, CRC(1c74109d) SHA1(c9180a32e78481c9082ad5bc75082ef4b289ad76), ROM_BIOS(0) )
 	ROM_SYSTEM_BIOS( 1, "3dpro", "3DPro 4MB EDO 1.06 (12-18-97)" )
 	ROMX_LOAD( "3dpro4mbedo.bin", 0x000000, 0x010000, CRC(f04b374c) SHA1(6eb96f7517df6eb566c615c2ab9ec5567035b6a5), ROM_BIOS(1) )

src/devices/bus/pci/trident_4dwavedx.cpp

@@ -8,7 +8,8 @@ AC'97 v1.x (fixed 48 kHz)
 
 TODO:
 - dxdiag: sound test don't playback on lower modes;
-- diablo: ambient BGM doesn't work, SFXs don't playback from time to time;
+- diablo: dungeon ambient BGM and townspeople speech doesn't work
+  \- streaming LBA bank from .mpq is empty in both cases (?)
 - Missing features in Bank A (testable in dxdiag -> Music -> Trident PCI WaveTable MIDI);
 - Move DMA reading out of sound_stream_update;
 - Mix-in wave engine output to AC'97 input;
@@ -413,6 +414,29 @@ void t4dwave_pcm_device::device_reset()
 	m_miscint = 0;
 	m_aina = m_aintena = m_ainb = m_aintenb = 0;
 	m_bankA_keyon = m_bankB_keyon = 0;
+
+	for (int i = 0; i < 64; i++)
+	{
+		m_channel[i].lba = 0;
+		m_channel[i].cso = 0;
+		m_channel[i].eso_cache = 0;
+		std::fill(std::begin(m_channel[i].hso), std::end(m_channel[i].hso), 0);
+		std::fill(std::begin(m_channel[i].eso), std::end(m_channel[i].eso), 0);
+		m_channel[i].delta = 0;
+		m_channel[i].gvsel_cache = 0;
+		m_channel[i].gvsel = false;
+		m_channel[i].pan_control = false;
+		m_channel[i].pan_vol = 0;
+		m_channel[i].vol = 0;
+		m_channel[i].play_mode = 0;
+		m_channel[i].loop_enable = 0;
+		m_channel[i].ec_envelope = 0;
+		m_channel[i].pci_buf = 0;
+
+		m_channel[i].ticks = 0;
+		m_channel[i].sample_data = 0;
+		m_channel[i].dma_fetch = false;
+	}
 }
 
 // START_A & STOP_A
@@ -838,7 +862,6 @@ void t4dwave_pcm_device::sound_stream_update(sound_stream &stream)
 					}
 					if (channel.cso >= channel.eso[play_mode])
 					{
-						channel.cso = 0;
 						// ENDLP_IE
 						if (BIT(m_global_control, 12))
 						{
@@ -854,8 +877,15 @@ void t4dwave_pcm_device::sound_stream_update(sound_stream &stream)
 								m_bankB_keyon &= ~(1 << chB);
 							else
 								m_bankA_keyon &= ~(1 << ch);
+							// TODO: not entirely correct
+							// diablo: really wants CSO granularity being different depending on play mode
+							channel.cso = 0xffff;
 							continue;
 						}
+						else
+						{
+							channel.cso = 0;
+						}
 					}
 				}
 			}

src/devices/machine/vt82c598mvp.cpp

@@ -452,7 +452,9 @@ void vt82c598mvp_host_device::map_extra(
 	// 01 SMI DRAM always mapped (overlays VGA)
 	// 10 <reserved>
 	// 11 SMI DRAM on SMM
-	if ((smi_mapping == 3 && m_smiact == 0) || smi_mapping == 1)
+	// HACK: function is for '691, that actually uses code/data separation for SMI DRAM
+	// (never setup shadow RAM control[2] bits 0-1)
+	if ((smi_mapping == smi_bank() && m_smiact == 0) || smi_mapping == 1)
 	{
 		memory_space->install_ram      (0x000a0000, 0x000bffff, &m_ram[0x000a0000/4]);
 	}

src/devices/machine/vt82c598mvp.h

@@ -42,6 +42,8 @@ class vt82c598mvp_host_device : public pci_host_device
 	required_device<cpu_device> m_host_cpu;
 	std::vector<uint32_t> m_ram;
 
+	virtual u8 smi_bank() const { return 3; }
+
 private:
 	virtual uint8_t capptr_r() override;
 
@@ -107,6 +109,8 @@ class vt82c691_host_device : public vt82c598mvp_host_device
 
 	virtual void config_map(address_map &map) override ATTR_COLD;
 
+	virtual u8 smi_bank() const override { return 0; }
+
 private:
 	u8 m_bios_scratch[8];
 };

src/devices/machine/x28.cpp

@@ -0,0 +1,58 @@
+// license:BSD-3-Clause
+// copyright-holders:Christian Brunschen
+/***************************************************************************
+  Xicor X28 EEPROMs
+***************************************************************************/
+
+#include "emu.h"
+#include "x28.h"
+
+// device type definitions
+DEFINE_DEVICE_TYPE(X28C64, x28c64_device, "x28c64", "X28C64 8Kx8 EEPROM")
+DEFINE_DEVICE_TYPE(X28C256, x28c256_device, "x28c256", "X28C256 32Kx8 EEPROM")
+DEFINE_DEVICE_TYPE(X28HC256, x28hc256_device, "x28hc256", "X28HC256 32Kx8 EEPROM")
+DEFINE_DEVICE_TYPE(X28C512, x28c512_device, "x28c512", "X28C512 64Kx8 EEPROM")
+DEFINE_DEVICE_TYPE(X28C010, x28c010_device, "x28c010", "X28C010 128Kx8 EEPROM")
+DEFINE_DEVICE_TYPE(XM28C020, xm28c020_device, "xm28c020", "XM28C020 256Kx8 EEPROM")
+DEFINE_DEVICE_TYPE(XM28C040, xm28c040_device, "xm28c040", "XM28C040 512Kx8 EEPROM")
+DEFINE_DEVICE_TYPE(X28F256, x28f256_device, "x28f256", "X28F256 Fast 8Kx8 EEPROM")
+
+x28c64_device::x28c64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+: x28_device(mconfig, X28C64, tag, owner, clock)
+{
+}
+
+x28c256_device::x28c256_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+: x28_device(mconfig, X28C256, tag, owner, clock)
+{
+}
+
+x28hc256_device::x28hc256_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+: x28_device(mconfig, X28HC256, tag, owner, clock)
+{
+}
+
+x28c512_device::x28c512_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+: x28_device(mconfig, X28C512, tag, owner, clock)
+{
+}
+
+x28c010_device::x28c010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+: x28_device(mconfig, X28C010, tag, owner, clock)
+{
+}
+
+xm28c020_device::xm28c020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+: x28_device(mconfig, XM28C020, tag, owner, clock)
+{
+}
+
+xm28c040_device::xm28c040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+: x28_device(mconfig, XM28C040, tag, owner, clock)
+{
+}
+
+x28f256_device::x28f256_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+: x28_device(mconfig, X28F256, tag, owner, clock)
+{
+}