tms52xx: Remove legacy spchrom implementation.

mamedev · Feb 27, 2025 · d96222a · d96222a
1 parent 16817fb
commit d96222a
Show file tree

Hide file tree

Showing 13 changed files with 183 additions and 330 deletions.
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
@@ -1123,8 +1123,6 @@ if (SOUNDS["TMS5220"]~=null) then
 		MAME_DIR .. "src/devices/sound/tms5220.cpp",
 		MAME_DIR .. "src/devices/sound/tms5220.h",
 		MAME_DIR .. "src/devices/sound/tms5110r.hxx",
-		MAME_DIR .. "src/devices/machine/spchrom.cpp",
-		MAME_DIR .. "src/devices/machine/spchrom.h",
 	}
 end
 

diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp
@@ -114,16 +114,20 @@ void electron_m2105_device::device_add_mconfig(machine_config &config)
 	output_latch_device &latch(OUTPUT_LATCH(config, "cent_data_out"));
 	centronics.set_output_latch(latch);
 
-	SPEECHROM(config, "vsm", 0).set_reverse_bit_order(true);
-
 	tms5220_device &tms(TMS5220(config, "vsp", 640000));
-	tms.set_speechrom_tag("vsm");
 	tms.ready_cb().set(m_via[0], FUNC(via6522_device::write_ca1));
 	tms.ready_cb().append(m_via[0], FUNC(via6522_device::write_pb2));
 	tms.irq_cb().set(m_via[0], FUNC(via6522_device::write_ca2));
 	tms.irq_cb().append(m_via[0], FUNC(via6522_device::write_pb3));
 	tms.add_route(ALL_OUTPUTS, "mono", 0.5);
 
+	TMS6100(config, "vsm", 0);
+	tms.m0_cb().set("vsm", FUNC(tms6100_device::m0_w));
+	tms.m1_cb().set("vsm", FUNC(tms6100_device::m1_w));
+	tms.addr_cb().set("vsm", FUNC(tms6100_device::add_w));
+	tms.data_cb().set("vsm", FUNC(tms6100_device::data_line_r));
+	tms.romclk_cb().set("vsm", FUNC(tms6100_device::clk_w));
+
 	SPEAKER(config, "mono").front_center();
 }
 

diff --git a/src/devices/bus/mpf1/ssb.cpp b/src/devices/bus/mpf1/ssb.cpp
@@ -14,7 +14,6 @@
 
 #include "emu.h"
 #include "ssb.h"
-#include "machine/spchrom.h"
 #include "sound/tms5220.h"
 #include "bus/generic/carts.h"
 #include "bus/generic/slot.h"

diff --git a/src/devices/bus/ti99/internal/998board.h b/src/devices/bus/ti99/internal/998board.h
@@ -25,6 +25,7 @@
 #include "machine/ram.h"
 #include "machine/tmc0430.h"
 #include "machine/tms9901.h"
+#include "machine/tms6100.h"
 #include "sound/sn76496.h"
 #include "sound/tms5220.h"
 #include "video/tms9928a.h"

diff --git a/src/devices/bus/ti99/peb/spchsyn.cpp b/src/devices/bus/ti99/peb/spchsyn.cpp
@@ -23,8 +23,6 @@
 
 #include "emu.h"
 #include "spchsyn.h"
-
-#include "machine/spchrom.h"
 #include "speaker.h"
 
 #define LOG_WARN        (1U << 1)    // Warnings
@@ -154,22 +152,18 @@ ROM_END
 
 void ti_speech_synthesizer_device::device_add_mconfig(machine_config& config)
 {
-	SPEECHROM(config, "vsm", 0).set_reverse_bit_order(true);
 	SPEAKER(config, "speech_out").front_center();
 	CD2501E(config, m_vsp, 640000L);
-	m_vsp->set_speechrom_tag("vsm");
+
 	m_vsp->ready_cb().set(FUNC(ti_speech_synthesizer_device::speech_ready));
 	m_vsp->add_route(ALL_OUTPUTS, "speech_out", 0.50);
 
-/*
-    // FIXME: Make it work. Guess we need two VSM circuits @16K.
-    TMS6100(config, "vsm", 640_kHz_XTAL/4);
-    m_vsp->m0_cb().set("vsm", FUNC(tms6100_device::m0_w));
-    m_vsp->m1_cb().set("vsm", FUNC(tms6100_device::m1_w));
-    m_vsp->addr_cb().set("vsm", FUNC(tms6100_device::add_w));
-    m_vsp->data_cb().set("vsm", FUNC(tms6100_device::data_line_r));
-    m_vsp->romclk_cb().set("vsm", FUNC(tms6100_device::clk_w));
-*/
+	TMS6100(config, "vsm", 0);
+	m_vsp->m0_cb().set("vsm", FUNC(tms6100_device::m0_w));
+	m_vsp->m1_cb().set("vsm", FUNC(tms6100_device::m1_w));
+	m_vsp->addr_cb().set("vsm", FUNC(tms6100_device::add_w));
+	m_vsp->data_cb().set("vsm", FUNC(tms6100_device::data_line_r));
+	m_vsp->romclk_cb().set("vsm", FUNC(tms6100_device::clk_w));
 }
 
 INPUT_PORTS_START( ti99_speech )

diff --git a/src/devices/machine/spchrom.cpp b/src/devices/machine/spchrom.cpp
diff --git a/src/devices/machine/spchrom.h b/src/devices/machine/spchrom.h