sinclair/spec128.cpp: Supported varieties of AY devices through configurable slot

scripts/src/bus.lua

@@ -4941,6 +4941,20 @@ if (BUSES["SPECTRUM"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/bus/spectrum/ay/slot.h,BUSES["AY_SLOT"] = true
+---------------------------------------------------
+
+if (BUSES["AY_SLOT"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/bus/spectrum/ay/slot.cpp",
+		MAME_DIR .. "src/devices/bus/spectrum/ay/slot.h",
+		MAME_DIR .. "src/devices/bus/spectrum/ay/cards.cpp",
+		MAME_DIR .. "src/devices/bus/spectrum/ay/cards.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/bus/spectrum/zxbus/bus.h,BUSES["ZXBUS"] = true

src/devices/bus/spectrum/ay/cards.cpp

@@ -0,0 +1,71 @@
+// license:BSD-3-Clause
+// copyright-holders:Andrei I. Holub
+
+#include "emu.h"
+#include "cards.h"
+
+namespace bus::spectrum::ay_slot {
+
+namespace {
+
+class ay8912_device : public spectrum_ay_device
+{
+public:
+	ay8912_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+		: spectrum_ay_device(mconfig, AY_SLOT_AY8912, tag, owner, clock)
+	{ }
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+};
+
+void ay8912_device::device_add_mconfig(machine_config &config)
+{
+	AY8912(config, m_ay0, clock());
+	spectrum_ay_device::device_add_mconfig(config);
+}
+
+
+class turbosound_device : public spectrum_ay_device
+{
+public:
+	turbosound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+		: spectrum_ay_device(mconfig, AY_SLOT_TURBOSOUND, tag, owner, clock)
+	{ }
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+};
+
+void turbosound_device::device_add_mconfig(machine_config &config)
+{
+	YM2149(config, m_ay0, clock());
+	YM2149(config, m_ay1, clock());
+	spectrum_ay_device::device_add_mconfig(config);
+}
+
+
+class ym2149_device : public spectrum_ay_device
+{
+public:
+	ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+		: spectrum_ay_device(mconfig, AY_SLOT_YM2149, tag, owner, clock)
+	{ }
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+};
+
+void ym2149_device::device_add_mconfig(machine_config &config)
+{
+	YM2149(config, m_ay0, clock());
+	spectrum_ay_device::device_add_mconfig(config);
+}
+
+} // anonymous namespace
+
+} // namespace bus::spectrum::ay_slot
+
+DEFINE_DEVICE_TYPE_PRIVATE(AY_SLOT_AY8912,     device_ay_slot_interface, bus::spectrum::ay_slot::ay8912_device,     "ay_ay8912",     "AY8912")
+DEFINE_DEVICE_TYPE_PRIVATE(AY_SLOT_TURBOSOUND, device_ay_slot_interface, bus::spectrum::ay_slot::turbosound_device, "ay_turbosound", "TURBOSOUND")
+DEFINE_DEVICE_TYPE_PRIVATE(AY_SLOT_YM2149,     device_ay_slot_interface, bus::spectrum::ay_slot::ym2149_device,     "ay_ym2149",     "YM2149")

src/devices/bus/spectrum/ay/cards.h

@@ -0,0 +1,16 @@
+// license:BSD-3-Clause
+// copyright-holders:Andrei I. Holub
+
+#ifndef MAME_BUS_SPECTRUM_AY_CARDS_H
+#define MAME_BUS_SPECTRUM_AY_CARDS_H
+
+#pragma once
+
+#include "slot.h"
+
+
+DECLARE_DEVICE_TYPE(AY_SLOT_AY8912, device_ay_slot_interface)
+DECLARE_DEVICE_TYPE(AY_SLOT_YM2149, device_ay_slot_interface)
+DECLARE_DEVICE_TYPE(AY_SLOT_TURBOSOUND, device_ay_slot_interface)
+
+#endif // MAME_BUS_SPECTRUM_AY_CARDS_H

src/devices/bus/spectrum/ay/slot.cpp

@@ -0,0 +1,131 @@
+// license:BSD-3-Clause
+// copyright-holders:Andrei I. Holub
+/**********************************************************************
+    AY Slot for ZX Spectrum
+
+    Supports variates AY8910 sound chips
+**********************************************************************/
+
+#include "emu.h"
+#include "slot.h"
+
+DEFINE_DEVICE_TYPE(AY_SLOT, ay_slot_device, "ay_slot", "AY Slot")
+
+ay_slot_device::ay_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: ay_slot_device(mconfig, AY_SLOT, tag, owner, clock)
+{
+}
+
+ay_slot_device::ay_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_single_card_slot_interface<device_ay_slot_interface>(mconfig, *this)
+	, device_mixer_interface(mconfig, *this)
+	, m_dev(nullptr)
+{
+}
+
+ay_slot_device::~ay_slot_device()
+{
+}
+
+void ay_slot_device::device_start()
+{
+	m_dev = get_card_device();
+}
+
+u8 ay_slot_device::data_r()
+{
+	return m_dev ? m_dev->data_r() : 0xff;
+};
+
+void ay_slot_device::data_w(u8 data)
+{
+	if (m_dev) m_dev->data_w(data);
+};
+
+void ay_slot_device::address_w(u8 data)
+{
+	if (m_dev) m_dev->address_w(data);
+};
+
+
+device_ay_slot_interface::device_ay_slot_interface(const machine_config &mconfig, device_t &device)
+	: device_interface(device, "ay")
+{
+	m_slot = dynamic_cast<ay_slot_device *>(device.owner());
+}
+
+device_ay_slot_interface::~device_ay_slot_interface()
+{
+}
+
+
+spectrum_ay_device::spectrum_ay_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_ay_slot_interface(mconfig, *this)
+	, m_ay0(*this, "ay0")
+	, m_ay1(*this, "ay1")
+{
+}
+
+u8 spectrum_ay_device::data_r()
+{
+	if (m_ay_selected)
+		return m_ay1->data_r();
+	else
+		return m_ay0->data_r();
+}
+
+void spectrum_ay_device::data_w(u8 data)
+{
+	if (m_ay_selected)
+		return m_ay1->data_w(data);
+	else
+		return m_ay0->data_w(data);
+}
+
+void spectrum_ay_device::address_w(u8 data)
+{
+	if (m_ay1 &&  ((data & 0xfe) == 0xfe))
+		m_ay_selected = data & 1;
+	else if (m_ay_selected)
+		m_ay1->address_w(data);
+	else
+		m_ay0->address_w(data);
+}
+
+void spectrum_ay_device::device_start()
+{
+	save_item(NAME(m_ay_selected));
+}
+
+void spectrum_ay_device::device_reset()
+{
+	m_ay_selected = 0;
+}
+
+void spectrum_ay_device::device_add_mconfig(machine_config &config)
+{
+	m_ay0->add_route(0, DEVICE_SELF_OWNER, 1.0, 0)
+		.add_route(1, DEVICE_SELF_OWNER, 1.0, 1)
+		.add_route(2, DEVICE_SELF_OWNER, 1.0, 2);
+	if (m_ay1)
+	{
+		m_ay1->add_route(0, DEVICE_SELF_OWNER, 1.0, 0)
+			.add_route(1, DEVICE_SELF_OWNER, 1.0, 1)
+			.add_route(2, DEVICE_SELF_OWNER, 1.0, 2);
+	}
+}
+
+
+#include "cards.h"
+
+template class device_finder<device_ay_slot_interface, false>;
+template class device_finder<device_ay_slot_interface, true>;
+
+void default_ay_slot_devices(device_slot_interface &device)
+{
+	device.option_add("ay_ay8912",     AY_SLOT_AY8912);
+	device.option_add("ay_turbosound", AY_SLOT_TURBOSOUND);
+	device.option_add("ay_ym2149",     AY_SLOT_YM2149);
+}

src/devices/bus/spectrum/ay/slot.h

@@ -0,0 +1,86 @@
+// license:BSD-3-Clause
+// copyright-holders:Andrei I. Holub
+#ifndef MAME_BUS_SPECTRUM_AY_SLOT_H
+#define MAME_BUS_SPECTRUM_AY_SLOT_H
+
+#pragma once
+
+#include "sound/ay8910.h"
+
+
+class device_ay_slot_interface;
+
+class ay_slot_device : public device_t
+	, public device_single_card_slot_interface<device_ay_slot_interface>
+	, public device_mixer_interface
+{
+	friend class device_ay_slot_interface;
+
+public:
+	template <typename T>
+	ay_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, T &&opts, const char *dflt)
+		: ay_slot_device(mconfig, tag, owner, clock)
+	{
+		option_reset();
+		opts(*this);
+		set_default_option(dflt);
+		set_fixed(false);
+	}
+	ay_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+	virtual ~ay_slot_device();
+
+	u8 data_r();
+	void data_w(u8 data);
+	void address_w(u8 data);
+
+protected:
+	ay_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+
+	virtual void device_start() override ATTR_COLD;
+
+private:
+	device_ay_slot_interface *m_dev;
+};
+
+class device_ay_slot_interface : public device_interface
+{
+	friend class ay_slot_device;
+
+public:
+	virtual ~device_ay_slot_interface();
+
+	virtual u8 data_r() { return 0xff; };
+	virtual void data_w(u8 data) {};
+	virtual void address_w(u8 data) {};
+
+protected:
+	device_ay_slot_interface(const machine_config &mconfig, device_t &device);
+
+	ay_slot_device *m_slot;
+};
+
+class spectrum_ay_device : public device_t, public device_ay_slot_interface
+{
+public:
+	virtual u8 data_r() override;
+	virtual void data_w(u8 data) override;
+	virtual void address_w(u8 data) override;
+
+protected:
+	spectrum_ay_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+
+	virtual void device_start() override ATTR_COLD;
+	virtual void device_reset() override ATTR_COLD;
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+
+	required_device<ay8910_device> m_ay0;
+	optional_device<ay8910_device> m_ay1;
+
+	u8 m_ay_selected;
+};
+
+DECLARE_DEVICE_TYPE(AY_SLOT, ay_slot_device)
+
+void default_ay_slot_devices(device_slot_interface &device);
+
+#endif // MAME_BUS_SPECTRUM_AY_SLOT_H

src/mame/sinclair/atm.cpp

@@ -13,9 +13,9 @@ MicroART ATM (clone of Spectrum)
 #include "emu.h"
 #include "atm.h"
 
+#include "bus/spectrum/ay/slot.h"
 #include "bus/ata/atapicdr.h"
 #include "bus/ata/hdd.h"
-#include "sound/ay8910.h"
 
 #define LOG_MEM   (1U << 1)
 #define LOG_VIDEO (1U << 2)
@@ -381,8 +381,8 @@ void atm_state::atm_io(address_map &map)
 	map(0x00fd, 0x00fd).mirror(0xff00).w(FUNC(atm_state::atm_port_7ffd_w));
 
 	map(0xfadf, 0xfadf).mirror(0x0500).nopr(); // TODO 0xfadf, 0xfbdf, 0xffdf Kempston Mouse
-	map(0x8000, 0x8000).mirror(0x3ffd).w("ay8912", FUNC(ay8910_device::data_w));
-	map(0xc000, 0xc000).mirror(0x3ffd).rw("ay8912", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w));
+	map(0x8000, 0x8000).mirror(0x3ffd).w("ay_slot", FUNC(ay_slot_device::data_w));
+	map(0xc000, 0xc000).mirror(0x3ffd).rw("ay_slot", FUNC(ay_slot_device::data_r), FUNC(ay_slot_device::address_w));
 
 	// PORTS: Shadow
 	map(0x0000, 0xffff).view(m_io_view);