summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/sound/okim9810.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/sound/okim9810.c')
-rw-r--r--src/emu/sound/okim9810.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/emu/sound/okim9810.c b/src/emu/sound/okim9810.c
index 311138e8df7..e134e646ddb 100644
--- a/src/emu/sound/okim9810.c
+++ b/src/emu/sound/okim9810.c
@@ -4,7 +4,7 @@
okim9810.h
- OKI MSM9810 ADCPM(2) sound chip.
+ OKI MSM9810 ADPCM(2) sound chip.
***************************************************************************/
@@ -313,31 +313,31 @@ void okim9810_device::write_command(UINT8 data)
const offs_t base = m_TMP_register * 8;
offs_t startAddr;
- UINT8 startFlags = m_direct->read_raw_byte(base + 0);
- startAddr = m_direct->read_raw_byte(base + 1) << 16;
- startAddr |= m_direct->read_raw_byte(base + 2) << 8;
- startAddr |= m_direct->read_raw_byte(base + 3) << 0;
+ UINT8 startFlags = m_direct->read_byte(base + 0);
+ startAddr = m_direct->read_byte(base + 1) << 16;
+ startAddr |= m_direct->read_byte(base + 2) << 8;
+ startAddr |= m_direct->read_byte(base + 3) << 0;
offs_t endAddr;
- UINT8 endFlags = m_direct->read_raw_byte(base + 4);
- endAddr = m_direct->read_raw_byte(base + 5) << 16;
- endAddr |= m_direct->read_raw_byte(base + 6) << 8;
- endAddr |= m_direct->read_raw_byte(base + 7) << 0;
+ UINT8 endFlags = m_direct->read_byte(base + 4);
+ endAddr = m_direct->read_byte(base + 5) << 16;
+ endAddr |= m_direct->read_byte(base + 6) << 8;
+ endAddr |= m_direct->read_byte(base + 7) << 0;
// Sub-table
if (startFlags & 0x80)
{
offs_t subTable = startAddr;
// TODO: New startFlags &= 0x80. Are there further subtables?
- startFlags = m_direct->read_raw_byte(subTable + 0);
- startAddr = m_direct->read_raw_byte(subTable + 1) << 16;
- startAddr |= m_direct->read_raw_byte(subTable + 2) << 8;
- startAddr |= m_direct->read_raw_byte(subTable + 3) << 0;
+ startFlags = m_direct->read_byte(subTable + 0);
+ startAddr = m_direct->read_byte(subTable + 1) << 16;
+ startAddr |= m_direct->read_byte(subTable + 2) << 8;
+ startAddr |= m_direct->read_byte(subTable + 3) << 0;
// TODO: What does byte (subTable + 4) refer to?
- endAddr = m_direct->read_raw_byte(subTable + 5) << 16;
- endAddr |= m_direct->read_raw_byte(subTable + 6) << 8;
- endAddr |= m_direct->read_raw_byte(subTable + 7) << 0;
+ endAddr = m_direct->read_byte(subTable + 5) << 16;
+ endAddr |= m_direct->read_byte(subTable + 6) << 8;
+ endAddr |= m_direct->read_byte(subTable + 7) << 0;
}
m_voice[channel].m_sample = 0;
@@ -478,7 +478,7 @@ void okim9810_device::okim_voice::generate_audio(direct_read_data &direct,
if (m_sample == 0)
{
// fetch the first sample nibble
- int nibble0 = direct.read_raw_byte(m_base_offset + m_sample / 2) >> (((m_sample & 1) << 2) ^ 4);
+ int nibble0 = direct.read_byte(m_base_offset + m_sample / 2) >> (((m_sample & 1) << 2) ^ 4);
switch (m_playbackAlgo)
{
case OKIM9810_ADPCM_PLAYBACK:
@@ -504,7 +504,7 @@ void okim9810_device::okim_voice::generate_audio(direct_read_data &direct,
}
// And fetch the second sample nibble
- int nibble1 = direct.read_raw_byte(m_base_offset + (m_sample+1) / 2) >> ((((m_sample+1) & 1) << 2) ^ 4);
+ int nibble1 = direct.read_byte(m_base_offset + (m_sample+1) / 2) >> ((((m_sample+1) & 1) << 2) ^ 4);
switch (m_playbackAlgo)
{
case OKIM9810_ADPCM_PLAYBACK: