From 8e5664b17816a8dce9f6aa891418f5c31336cfc6 Mon Sep 17 00:00:00 2001
From: Andrew Gardner <andrew-gardner@users.noreply.github.com>
Date: Thu, 17 Feb 2011 06:28:24 +0000
Subject: [PATCH] OKI MSM9810 : Added sub-table lookups. [Andrew Gardner]

(out of whatsnew.txt)
Still plenty to do, but half the games should sound perfect now.
---
 src/emu/sound/okim9810.c | 39 +++++++++++++++++++++++++++++++++++++--
 src/emu/sound/okim9810.h | 15 +++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/emu/sound/okim9810.c b/src/emu/sound/okim9810.c
index 02550ab5998..a226c35b290 100644
--- a/src/emu/sound/okim9810.c
+++ b/src/emu/sound/okim9810.c
@@ -40,6 +40,27 @@ const UINT8 okim9810_device::s_volume_table[16] =
 	0x04,	// -30.0 dB
 };
 
+// sampling frequency lookup table.
+const UINT32 okim9810_device::s_sampling_freq_table[16] = 
+{
+    4000,
+    8000,
+    16000,
+    32000,
+    0,
+    6400,
+    12800,
+    25600,
+    0,
+    5300,
+    10600,
+    21200,
+    0,
+    0,
+    0,
+    0
+};
+
 // default address map
 static ADDRESS_MAP_START( okim9810, 0, 8 )
     AM_RANGE(0x000000, 0xffffff) AM_ROM
@@ -294,6 +315,20 @@ void okim9810_device::write_command(UINT8 data)
             endAddr |= m_direct->read_raw_byte(base + 6) << 8;
             endAddr |= m_direct->read_raw_byte(base + 7) << 0;
 
+			// Sub-table
+            if (startFlags & 0x80)
+            {
+                // TODO: Offset (oldStart+0) and (oldStart+4) are currently ignored - can the chaining continue?
+                offs_t oldStart = startAddr;
+                startAddr  = m_direct->read_raw_byte(oldStart + 1) << 16;
+                startAddr |= m_direct->read_raw_byte(oldStart + 2) << 8;
+                startAddr |= m_direct->read_raw_byte(oldStart + 3) << 0;
+                
+                endAddr  = m_direct->read_raw_byte(oldStart + 5) << 16;
+                endAddr |= m_direct->read_raw_byte(oldStart + 6) << 8;
+                endAddr |= m_direct->read_raw_byte(oldStart + 7) << 0;
+            }
+
             mame_printf_verbose("FADR  channel %d phrase offset %02x => ", channel, m_TMP_register);
             mame_printf_verbose("\tstartFlags(%02x) startAddr(%06x) endFlags(%02x) endAddr(%06x) bytes(%d)\n", startFlags, startAddr, endFlags, endAddr, endAddr-startAddr);
             m_voice[channel].m_sample = 0;
@@ -314,13 +349,13 @@ void okim9810_device::write_command(UINT8 data)
 
         case 0x06:  // DADR (direct address playback)
         {
-            mame_printf_warning("DADR  channel %d complex data %02x\n", channel, m_TMP_register); 
+            mame_printf_warning("DADR  channel %d complex data %02x\n", channel, m_TMP_register);
             mame_printf_warning("MSM9810: UNIMPLEMENTED COMMAND!\n");
             break;
         }
         case 0x07:  // CVOL (channel volume)
         {
-            mame_printf_verbose("CVOL  channel %d volume level %02x\n", channel, m_TMP_register); 
+            mame_printf_verbose("CVOL  channel %d volume level %02x\n", channel, m_TMP_register);
             mame_printf_verbose("\tChannel %d -> volume %d.\n", channel, s_volume_table[m_TMP_register & 0x0f]);
 
             m_voice[channel].m_volume = s_volume_table[m_TMP_register & 0x0f];
diff --git a/src/emu/sound/okim9810.h b/src/emu/sound/okim9810.h
index 553a4b2c35d..d6feb9b49c1 100644
--- a/src/emu/sound/okim9810.h
+++ b/src/emu/sound/okim9810.h
@@ -33,6 +33,20 @@ enum
     OKIM9810_NONLINEAR8_PLAYBACK = 3
 };
 
+enum
+{
+	OKIM9810_SECONDARY_FILTER = 0,
+	OKIM9810_PRIMARY_FILTER = 1,
+    OKIM9810_NO_FILTER = 2,
+    OKIM9810_NO_FILTER2 = 3
+};
+
+enum
+{
+	OKIM9810_OUTPUT_TO_DIRECT_DAC = 0,
+	OKIM9810_OUTPUT_TO_VOLTAGE_FOLLOWER = 1
+};
+
 
 //**************************************************************************
 //  INTERFACE CONFIGURATION MACROS
@@ -144,6 +158,7 @@ protected:
 	okim_voice m_voice[OKIM9810_VOICES];
 
 	static const UINT8 s_volume_table[16];
+    static const UINT32 s_sampling_freq_table[16];
 };