summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound/x1_010.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/sound/x1_010.cpp')
-rw-r--r--src/devices/sound/x1_010.cpp61
1 files changed, 33 insertions, 28 deletions
diff --git a/src/devices/sound/x1_010.cpp b/src/devices/sound/x1_010.cpp
index a52f8504ddd..2947ed66654 100644
--- a/src/devices/sound/x1_010.cpp
+++ b/src/devices/sound/x1_010.cpp
@@ -56,13 +56,11 @@ Registers:
#include "x1_010.h"
-#define VERBOSE_SOUND 0
-#define VERBOSE_REGISTER_WRITE 0
-#define VERBOSE_REGISTER_READ 0
-
-#define LOG_SOUND(...) do { if (VERBOSE_SOUND) logerror(__VA_ARGS__); } while (0)
-#define LOG_REGISTER_WRITE(...) do { if (VERBOSE_REGISTER_WRITE) logerror(__VA_ARGS__); } while (0)
-#define LOG_REGISTER_READ(...) do { if (VERBOSE_REGISTER_READ) logerror(__VA_ARGS__); } while (0)
+#define LOG_SOUND (1U << 1)
+#define LOG_REGISTER_WRITE (1U << 2)
+#define LOG_REGISTER_READ (1U << 3)
+#define VERBOSE (0)
+#include "logmacro.h"
namespace {
@@ -89,7 +87,7 @@ DEFINE_DEVICE_TYPE(X1_010, x1_010_device, "x1_010", "Seta X1-010")
x1_010_device::x1_010_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: device_t(mconfig, X1_010, tag, owner, clock)
, device_sound_interface(mconfig, *this)
- , device_rom_interface(mconfig, *this, 20)
+ , device_rom_interface(mconfig, *this)
, m_rate(0)
, m_stream(nullptr)
, m_sound_enable(0)
@@ -116,10 +114,10 @@ void x1_010_device::device_start()
m_env_offset[i] = 0;
}
/* Print some more debug info */
- LOG_SOUND("masterclock = %d rate = %d\n", clock(), m_rate);
+ LOGMASKED(LOG_SOUND, "masterclock = %d rate = %d\n", clock(), m_rate);
/* get stream channels */
- m_stream = machine().sound().stream_alloc(*this, 0, 2, m_rate);
+ m_stream = stream_alloc(0, 2, m_rate);
m_reg = make_unique_clear<u8[]>(0x2000);
m_HI_WORD_BUF = make_unique_clear<u8[]>(0x2000);
@@ -147,10 +145,11 @@ void x1_010_device::device_clock_changed()
}
//-------------------------------------------------
-// rom_bank_updated - the rom bank has changed
+// rom_bank_pre_change - refresh the stream if the
+// ROM banking changes
//-------------------------------------------------
-void x1_010_device::rom_bank_updated()
+void x1_010_device::rom_bank_pre_change()
{
m_stream->update();
}
@@ -179,7 +178,7 @@ void x1_010_device::write(offs_t offset, u8 data)
m_smp_offset[channel] = 0;
m_env_offset[channel] = 0;
}
- LOG_REGISTER_WRITE("%s: offset %6X : data %2X\n", machine().describe_context(), offset, data);
+ LOGMASKED(LOG_REGISTER_WRITE, "%s: offset %6X : data %2X\n", machine().describe_context(), offset, data);
m_reg[offset] = data;
}
@@ -191,7 +190,7 @@ u16 x1_010_device::word_r(offs_t offset)
u16 ret;
ret = m_HI_WORD_BUF[offset] << 8;
ret |= (read(offset) & 0xff);
- LOG_REGISTER_READ("%s: Read X1-010 Offset:%04X Data:%04X\n", machine().describe_context(), offset, ret);
+ LOGMASKED(LOG_REGISTER_READ, "%s: Read X1-010 Offset:%04X Data:%04X\n", machine().describe_context(), offset, ret);
return ret;
}
@@ -199,7 +198,7 @@ void x1_010_device::word_w(offs_t offset, u16 data)
{
m_HI_WORD_BUF[offset] = (data >> 8) & 0xff;
write(offset, data & 0xff);
- LOG_REGISTER_WRITE("%s: Write X1-010 Offset:%04X Data:%04X\n", machine().describe_context(), offset, data);
+ LOGMASKED(LOG_REGISTER_WRITE, "%s: Write X1-010 Offset:%04X Data:%04X\n", machine().describe_context(), offset, data);
}
@@ -207,21 +206,21 @@ void x1_010_device::word_w(offs_t offset, u16 data)
// sound_stream_update - handle a stream update
//-------------------------------------------------
-void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
+void x1_010_device::sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs)
{
// mixer buffer zero clear
- memset(outputs[0], 0, samples*sizeof(*outputs[0]));
- memset(outputs[1], 0, samples*sizeof(*outputs[1]));
+ outputs[0].fill(0);
+ outputs[1].fill(0);
// if (m_sound_enable == 0) return;
+ auto &bufL = outputs[0];
+ auto &bufR = outputs[1];
for (int ch = 0; ch < NUM_CHANNELS; ch++)
{
X1_010_CHANNEL *reg = (X1_010_CHANNEL *)&(m_reg[ch*sizeof(X1_010_CHANNEL)]);
if ((reg->status & 1) != 0) // Key On
{
- stream_sample_t *bufL = outputs[0];
- stream_sample_t *bufR = outputs[1];
const int div = (reg->status & 0x80) ? 1 : 0;
if ((reg->status & 2) == 0) // PCM sampling
{
@@ -237,10 +236,10 @@ void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t **
const u32 smp_step = freq;
if (smp_offs == 0)
{
- LOG_SOUND("Play sample %p - %p, channel %X volume %d:%d freq %X step %X offset %X\n",
+ LOGMASKED(LOG_SOUND, "Play sample %p - %p, channel %X volume %d:%d freq %X step %X offset %X\n",
start, end, ch, volL, volR, freq, smp_step, smp_offs);
}
- for (int i = 0; i < samples; i++)
+ for (int i = 0; i < bufL.samples(); i++)
{
const u32 delta = smp_offs >> 4;
// sample ended?
@@ -250,8 +249,8 @@ void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t **
break;
}
const s8 data = (s8)(read_byte(start+delta));
- *bufL++ += (data * volL / 256);
- *bufR++ += (data * volR / 256);
+ bufL.add_int(i, data * volL, 32768 * 256);
+ bufR.add_int(i, data * volR, 32768 * 256);
smp_offs += smp_step;
}
m_smp_offset[ch] = smp_offs;
@@ -269,10 +268,10 @@ void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t **
/* Print some more debug info */
if (smp_offs == 0)
{
- LOG_SOUND("Play waveform %X, channel %X volume %X freq %4X step %X offset %X\n",
+ LOGMASKED(LOG_SOUND, "Play waveform %X, channel %X volume %X freq %4X step %X offset %X\n",
reg->volume, ch, reg->end, freq, smp_step, smp_offs);
}
- for (int i = 0; i < samples; i++)
+ for (int i = 0; i < bufL.samples(); i++)
{
const u32 delta = env_offs >> 10;
// Envelope one shot mode
@@ -285,8 +284,8 @@ void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t **
const int volL = ((vol >> 4) & 0xf) * VOL_BASE;
const int volR = ((vol >> 0) & 0xf) * VOL_BASE;
const s8 data = (s8)(m_reg[start + ((smp_offs >> 10) & 0x7f)]);
- *bufL++ += (data * volL / 256);
- *bufR++ += (data * volR / 256);
+ bufL.add_int(i, data * volL, 32768 * 256);
+ bufR.add_int(i, data * volR, 32768 * 256);
smp_offs += smp_step;
env_offs += env_step;
}
@@ -295,4 +294,10 @@ void x1_010_device::sound_stream_update(sound_stream &stream, stream_sample_t **
}
}
}
+
+ for (int i = 0; i < bufL.samples(); i++)
+ {
+ bufL.put(i, std::clamp(bufL.getraw(i), -1.0f, 1.0f));
+ bufR.put(i, std::clamp(bufR.getraw(i), -1.0f, 1.0f));
+ }
}