summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2025-08-22 09:22:44 +0200
committer hap <happppp@users.noreply.github.com>2025-08-22 09:23:10 +0200
commit454e79c2369bb992df2ea55718319b581ba4090f (patch)
treefb4e448599d5d655c831641142963e7cc34aac0b
parent489a99234531a3f1e3fbe89f6b6ea888402c56b2 (diff)
twinkle: combine speakers,
djmain: update note
-rw-r--r--src/mame/konami/djmain.cpp6
-rw-r--r--src/mame/konami/twinkle.cpp15
2 files changed, 10 insertions, 11 deletions
diff --git a/src/mame/konami/djmain.cpp b/src/mame/konami/djmain.cpp
index 597611f66dc..25792861ccc 100644
--- a/src/mame/konami/djmain.cpp
+++ b/src/mame/konami/djmain.cpp
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:smf
/*
- * Beatmania DJ Main Board (GX753)
+ * Beatmania DJ Main Board (GQ753)
*
* Product numbers:
* GQ753 beatmania (first release in 1997.12)
@@ -27,7 +27,7 @@
*
* Chips:
* 15a: MC68EC020FG25 @ 16 MHz
- * 25b: 001642 (sprites, misc)
+ * 25b: 001642 or KS10101 (sprites, misc)
* 18d: 055555 (priority encoder)
* 5f: 056766 (color DAC)
* 18f: 056832 (tiles)
@@ -659,7 +659,7 @@ void djmain_state::maincpu_djmain(address_map &map)
map(0x480000, 0x48443f).ram().w(m_palette, FUNC(palette_device::write32)).share("palette"); // COLOR RAM
map(0x500000, 0x57ffff).rw(FUNC(djmain_state::sndram_r), FUNC(djmain_state::sndram_w)); // SOUND RAM
map(0x580000, 0x58003f).rw(m_k056832, FUNC(k056832_device::word_r), FUNC(k056832_device::word_w)); // VIDEO REG (tilemap)
- map(0x590000, 0x590007).w(FUNC(djmain_state::unknown590000_w)); // ??
+ map(0x590000, 0x590007).w(FUNC(djmain_state::unknown590000_w)); // M66011FP?
map(0x5a0000, 0x5a005f).w(m_k055555, FUNC(k055555_device::K055555_long_w)); // 055555: priority encoder
map(0x5b0000, 0x5b04ff).rw("k054539_1", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask32(0xff00ff00);
map(0x5b0000, 0x5b04ff).rw("k054539_2", FUNC(k054539_device::read), FUNC(k054539_device::write)).umask32(0x00ff00ff);
diff --git a/src/mame/konami/twinkle.cpp b/src/mame/konami/twinkle.cpp
index 2565bed765f..8b10b04aa7b 100644
--- a/src/mame/konami/twinkle.cpp
+++ b/src/mame/konami/twinkle.cpp
@@ -1154,8 +1154,8 @@ void twinkle_state::twinkle(machine_config &config)
NSCSI_CONNECTOR(config, "scsi:4").option_set("cdrom", NSCSI_XM5401).machine_config(
[](device_t *device)
{
- device->subdevice<cdda_device>("cdda")->add_route(0, "^^speakerleft", 1.0);
- device->subdevice<cdda_device>("cdda")->add_route(1, "^^speakerright", 1.0);
+ device->subdevice<cdda_device>("cdda")->add_route(0, "^^speaker", 1.0, 0);
+ device->subdevice<cdda_device>("cdda")->add_route(1, "^^speaker", 1.0, 1);
});
NSCSI_CONNECTOR(config, "scsi:7").option_set("ncr53cf96", NCR53CF96).clock(32_MHz_XTAL/2).machine_config(
[this](device_t *device)
@@ -1181,17 +1181,16 @@ void twinkle_state::twinkle(machine_config &config)
screen.set_physical_aspect(16, 9);
/* sound hardware */
- SPEAKER(config, "speakerleft").front_left();
- SPEAKER(config, "speakerright").front_right();
+ SPEAKER(config, "speaker", 2).front();
spu_device &spu(SPU(config, "spu", XTAL(67'737'600)/2, subdevice<psxcpu_device>("maincpu")));
- spu.add_route(0, "speakerleft", 0.75);
- spu.add_route(1, "speakerright", 0.75);
+ spu.add_route(0, "speaker", 0.75, 0);
+ spu.add_route(1, "speaker", 0.75, 1);
rf5c400_device &rf5c400(RF5C400(config, "rfsnd", XTAL(33'868'800)/2));
rf5c400.set_addrmap(0, &twinkle_state::rf5c400_map);
- rf5c400.add_route(0, "speakerleft", 1.0);
- rf5c400.add_route(1, "speakerright", 1.0);
+ rf5c400.add_route(0, "speaker", 1.0, 0);
+ rf5c400.add_route(1, "speaker", 1.0, 1);
}
void twinkle_state::twinkle_dvd_type1(machine_config &config)