summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound/swp20.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2023-10-06 22:48:46 +0200
committer Olivier Galibert <galibert@pobox.com>2023-10-06 22:49:12 +0200
commita90cc6becdb09b312335c681a70e57e0f78de48c (patch)
tree35528cede84a64fc340c82d07cff1906d8a612e1 /src/devices/sound/swp20.cpp
parent7f9a0514926537a2a6a4a37cffa1f373bf6b4b78 (diff)
mu80: make the wave rom test pass
Diffstat (limited to 'src/devices/sound/swp20.cpp')
-rw-r--r--src/devices/sound/swp20.cpp57
1 files changed, 47 insertions, 10 deletions
diff --git a/src/devices/sound/swp20.cpp b/src/devices/sound/swp20.cpp
index da4ef34dc4d..96ec6c0b15e 100644
--- a/src/devices/sound/swp20.cpp
+++ b/src/devices/sound/swp20.cpp
@@ -17,10 +17,18 @@ swp20_device::swp20_device(const machine_config &mconfig, const char *tag, devic
void swp20_device::device_start()
{
+ m_stream = stream_alloc(0, 2, 44100);
+
+ save_item(NAME(m_sample_address));
}
void swp20_device::device_reset()
{
+ std::fill(m_sample_address.begin(), m_sample_address.end(), 0);
+
+ m_waverom_access = 0;
+ m_waverom_val = 0;
+
m_p3c_port = 0x00;
m_p3c_address = true;
m_voice = 0x00;
@@ -32,6 +40,16 @@ void swp20_device::map(address_map &map)
{
map(0x00, 0x3f).rw(FUNC(swp20_device::snd_r), FUNC(swp20_device::snd_w));
+ map(0x01, 0x01).w(FUNC(swp20_device::voice_w));
+
+ map(0x2d, 0x2d).rw(FUNC(swp20_device::sample_address_r<2>), FUNC(swp20_device::sample_address_w<2>));
+ map(0x2e, 0x2e).rw(FUNC(swp20_device::sample_address_r<1>), FUNC(swp20_device::sample_address_w<1>));
+ map(0x2f, 0x2f).rw(FUNC(swp20_device::sample_address_r<0>), FUNC(swp20_device::sample_address_w<0>));
+
+ map(0x37, 0x37).w(FUNC(swp20_device::waverom_access_w));
+ map(0x3a, 0x3a).r(FUNC(swp20_device::waverom_val_r<1>));
+ map(0x3b, 0x3b).r(FUNC(swp20_device::waverom_val_r<0>));
+
map(0x3c, 0x3c).w(FUNC(swp20_device::p3c_w));
}
@@ -47,6 +65,35 @@ void swp20_device::map(address_map &map)
// write 40-5f.data
// etc
+void swp20_device::voice_w(u8 data)
+{
+ m_voice = data & 0x1f;
+}
+
+void swp20_device::waverom_access_w(u8 data)
+{
+ m_waverom_access = data;
+}
+
+template<int sel> u8 swp20_device::waverom_val_r()
+{
+ return read_word(m_sample_address[0x1f]*2) >> (8*sel);
+}
+
+template<int sel> void swp20_device::sample_address_w(offs_t offset, u8 data)
+{
+ m_stream->update();
+
+ m_sample_address[m_voice] = (m_sample_address[m_voice] & ~(0xff << (8*sel))) | (data << (8*sel));
+ if(!sel)
+ logerror("sample_address[%02x] = %04x\n", m_voice, m_sample_address[m_voice]);
+}
+
+template<int sel> u8 swp20_device::sample_address_r(offs_t offset)
+{
+ return m_sample_address[m_voice] >> (8*sel);
+}
+
void swp20_device::p3c_w(u8 data)
{
if(m_p3c_address)
@@ -67,10 +114,6 @@ void swp20_device::snd_w(offs_t offset, u8 data)
{
// Registers 0-f are global, 10-3f per-voice
switch(offset) {
- case 0x01:
- m_voice = data & 0x1f;
- break;
-
case 0x04: case 0x05: case 0x06: case 0x07: {
int off = 8*(offset & 3);
u32 mask = 0xff << off;
@@ -86,12 +129,6 @@ void swp20_device::snd_w(offs_t offset, u8 data)
break;
}
-
- case 0x10: // freq high
- break;
- case 0x11: // freq low
- break;
-
default:
logerror("w %02x.%02x, %02x %s\n", m_voice, offset, data, machine().describe_context());
}