summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/sound
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/sound')
-rw-r--r--src/emu/sound/aica.c72
-rw-r--r--src/emu/sound/aica.h10
-rw-r--r--src/emu/sound/ay8910.c85
-rw-r--r--src/emu/sound/cdp1869.c2
-rw-r--r--src/emu/sound/cdp1869.h4
-rw-r--r--src/emu/sound/dmadac.c3
-rw-r--r--src/emu/sound/dmadac.h2
-rw-r--r--src/emu/sound/es5503.c2
-rw-r--r--src/emu/sound/es5503.h8
-rw-r--r--src/emu/sound/ics2115.c2
-rw-r--r--src/emu/sound/k007232.h4
-rw-r--r--src/emu/sound/mos6560.h2
-rw-r--r--src/emu/sound/msm5205.h4
-rw-r--r--src/emu/sound/msm5232.c2
-rw-r--r--src/emu/sound/msm5232.h4
-rw-r--r--src/emu/sound/qs1000.c2
-rw-r--r--src/emu/sound/qs1000.h8
-rw-r--r--src/emu/sound/qsound.c18
-rw-r--r--src/emu/sound/scsp.c12
-rw-r--r--src/emu/sound/scsp.h28
-rw-r--r--src/emu/sound/sp0256.h8
-rw-r--r--src/emu/sound/spu.c12
-rw-r--r--src/emu/sound/tc8830f.c8
-rw-r--r--src/emu/sound/upd7759.c4
-rw-r--r--src/emu/sound/upd7759.h4
-rw-r--r--src/emu/sound/votrax.h4
-rw-r--r--src/emu/sound/ymf278b.c2
-rw-r--r--src/emu/sound/ymz280b.c2
-rw-r--r--src/emu/sound/zsg2.c44
-rw-r--r--src/emu/sound/zsg2.h2
30 files changed, 181 insertions, 183 deletions
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c
index 52c82e30187..9127251dc50 100644
--- a/src/emu/sound/aica.c
+++ b/src/emu/sound/aica.c
@@ -1400,10 +1400,10 @@ void aica_device::device_start()
// set up the IRQ callbacks
m_irq_cb.resolve_safe();
- m_main_irq_cb.resolve_safe();
+ m_main_irq_cb.resolve_safe();
m_stream = machine().sound().stream_alloc(*this, 0, 2, 44100);
-
+
// save state
save_item(NAME(m_IrqTimA));
save_item(NAME(m_IrqTimBC));
@@ -1416,7 +1416,7 @@ void aica_device::device_start()
save_item(NAME(m_LPANTABLE),0x20000);
save_item(NAME(m_RPANTABLE),0x20000);
save_item(NAME(m_TimPris),3);
- save_item(NAME(m_TimCnt),3);
+ save_item(NAME(m_TimCnt),3);
}
void aica_device::set_ram_base(void *base, int size)
@@ -1489,40 +1489,40 @@ aica_device::aica_device(const machine_config &mconfig, const char *tag, device_
m_bufferr(NULL),
m_length(0),
m_RBUFDST(NULL)
-
+
{
- memset(&m_udata.data, 0, sizeof(m_udata.data));
- memset(m_EFSPAN, 0, sizeof(m_EFSPAN));
- memset(m_Slots, 0, sizeof(m_Slots));
- memset(m_RINGBUF, 0, sizeof(m_RINGBUF));
- memset(m_MidiStack, 0, sizeof(m_MidiStack));
-
- memset(m_LPANTABLE, 0, sizeof(m_LPANTABLE));
- memset(m_RPANTABLE, 0, sizeof(m_RPANTABLE));
-
- memset(m_TimPris, 0, sizeof(m_TimPris));
- memset(m_TimCnt, 0, sizeof(m_TimCnt));
-
- memset(&m_dma, 0, sizeof(m_dma));
-
- memset(m_ARTABLE, 0, sizeof(m_ARTABLE));
- memset(m_DRTABLE, 0, sizeof(m_DRTABLE));
-
- memset(&m_DSP, 0, sizeof(m_DSP));
-
- memset(m_EG_TABLE, 0, sizeof(m_EG_TABLE));
- memset(m_PLFO_TRI, 0, sizeof(m_PLFO_TRI));
- memset(m_PLFO_SQR, 0, sizeof(m_PLFO_SQR));
- memset(m_PLFO_SAW, 0, sizeof(m_PLFO_SAW));
- memset(m_PLFO_NOI, 0, sizeof(m_PLFO_NOI));
-
- memset(m_ALFO_TRI, 0, sizeof(m_ALFO_TRI));
- memset(m_ALFO_SQR, 0, sizeof(m_ALFO_SQR));
- memset(m_ALFO_SAW, 0, sizeof(m_ALFO_SAW));
- memset(m_ALFO_NOI, 0, sizeof(m_ALFO_NOI));
-
- memset(m_PSCALES, 0, sizeof(m_PSCALES));
- memset(m_ASCALES, 0, sizeof(m_ASCALES));
+ memset(&m_udata.data, 0, sizeof(m_udata.data));
+ memset(m_EFSPAN, 0, sizeof(m_EFSPAN));
+ memset(m_Slots, 0, sizeof(m_Slots));
+ memset(m_RINGBUF, 0, sizeof(m_RINGBUF));
+ memset(m_MidiStack, 0, sizeof(m_MidiStack));
+
+ memset(m_LPANTABLE, 0, sizeof(m_LPANTABLE));
+ memset(m_RPANTABLE, 0, sizeof(m_RPANTABLE));
+
+ memset(m_TimPris, 0, sizeof(m_TimPris));
+ memset(m_TimCnt, 0, sizeof(m_TimCnt));
+
+ memset(&m_dma, 0, sizeof(m_dma));
+
+ memset(m_ARTABLE, 0, sizeof(m_ARTABLE));
+ memset(m_DRTABLE, 0, sizeof(m_DRTABLE));
+
+ memset(&m_DSP, 0, sizeof(m_DSP));
+
+ memset(m_EG_TABLE, 0, sizeof(m_EG_TABLE));
+ memset(m_PLFO_TRI, 0, sizeof(m_PLFO_TRI));
+ memset(m_PLFO_SQR, 0, sizeof(m_PLFO_SQR));
+ memset(m_PLFO_SAW, 0, sizeof(m_PLFO_SAW));
+ memset(m_PLFO_NOI, 0, sizeof(m_PLFO_NOI));
+
+ memset(m_ALFO_TRI, 0, sizeof(m_ALFO_TRI));
+ memset(m_ALFO_SQR, 0, sizeof(m_ALFO_SQR));
+ memset(m_ALFO_SAW, 0, sizeof(m_ALFO_SAW));
+ memset(m_ALFO_NOI, 0, sizeof(m_ALFO_NOI));
+
+ memset(m_PSCALES, 0, sizeof(m_PSCALES));
+ memset(m_ASCALES, 0, sizeof(m_ASCALES));
}
diff --git a/src/emu/sound/aica.h b/src/emu/sound/aica.h
index 25bcc011155..321bc5257d1 100644
--- a/src/emu/sound/aica.h
+++ b/src/emu/sound/aica.h
@@ -82,7 +82,7 @@ public:
static void set_roffset(device_t &device, int roffset) { downcast<aica_device &>(device).m_roffset = roffset; }
template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<aica_device &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb2_base &set_main_irq_callback(device_t &device, _Object object) { return downcast<aica_device &>(device).m_main_irq_cb.set_callback(object); }
-
+
// AICA register access
DECLARE_READ16_MEMBER( read );
DECLARE_WRITE16_MEMBER( write );
@@ -90,7 +90,7 @@ public:
// MIDI I/O access
DECLARE_WRITE16_MEMBER( midi_in );
DECLARE_READ16_MEMBER( midi_out_r );
-
+
void set_ram_base(void *base, int size);
protected:
@@ -146,7 +146,7 @@ private:
UINT16 data[0xc0/2];
UINT8 datab[0xc0];
} m_udata;
-
+
UINT16 m_IRQL, m_IRQR;
UINT16 m_EFSPAN[0x48];
AICA_SLOT m_Slots[64];
@@ -193,9 +193,9 @@ private:
stream_sample_t *m_bufferl;
stream_sample_t *m_bufferr;
-
+
int m_length;
-
+
signed short *m_RBUFDST; //this points to where the sample will be stored in the RingBuf
INT32 m_EG_TABLE[0x400];
int m_PLFO_TRI[256],m_PLFO_SQR[256],m_PLFO_SAW[256],m_PLFO_NOI[256];
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index e42d04af8b8..bce6bad9f21 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -422,18 +422,17 @@ INLINE void build_single_table(double rl, const ay_ym_param *par, int normalize,
INLINE void build_resisor_table(const ay_ym_param *par, INT32 *tab, int zero_is_off)
{
- int j;
-
- for (j=0; j < par->res_count; j++)
- {
-
- if (zero_is_off && j == 0)
- {
- tab[j] = 1e6;
- }
- else
- tab[j] = par->res[j];
- }
+ int j;
+
+ for (j=0; j < par->res_count; j++)
+ {
+ if (zero_is_off && j == 0)
+ {
+ tab[j] = 1e6;
+ }
+ else
+ tab[j] = par->res[j];
+ }
}
@@ -605,21 +604,21 @@ static STREAM_UPDATE( ay8910_update )
psg->count_noise++;
if (psg->count_noise >= NOISE_PERIOD(psg))
{
- /* toggle the prescaler output. Noise is no different to
- * channels.
- */
- psg->count_noise = 0;
- psg->prescale_noise ^= 1;
-
- if ( psg->prescale_noise)
- {
- /* The Random Number Generator of the 8910 is a 17-bit shift */
- /* register. The input to the shift register is bit0 XOR bit3 */
- /* (bit0 is the output). This was verified on AY-3-8910 and YM2149 chips. */
-
- psg->rng ^= (((psg->rng & 1) ^ ((psg->rng >> 3) & 1)) << 17);
- psg->rng >>= 1;
- }
+ /* toggle the prescaler output. Noise is no different to
+ * channels.
+ */
+ psg->count_noise = 0;
+ psg->prescale_noise ^= 1;
+
+ if ( psg->prescale_noise)
+ {
+ /* The Random Number Generator of the 8910 is a 17-bit shift */
+ /* register. The input to the shift register is bit0 XOR bit3 */
+ /* (bit0 is the output). This was verified on AY-3-8910 and YM2149 chips. */
+
+ psg->rng ^= (((psg->rng & 1) ^ ((psg->rng >> 3) & 1)) << 17);
+ psg->rng >>= 1;
+ }
}
for (chan = 0; chan < NUM_CHANNELS; chan++)
@@ -704,22 +703,22 @@ static void build_mixer_table(ay8910_context *psg)
normalize = 1;
}
- if ((psg->intf->flags & AY8910_RESISTOR_OUTPUT) != 0)
- {
- for (chan=0; chan < NUM_CHANNELS; chan++)
- {
- build_resisor_table(psg->par, psg->vol_table[chan], psg->zero_is_off);
- build_resisor_table(psg->par_env, psg->env_table[chan], 0);
- }
- }
- else
- {
- for (chan=0; chan < NUM_CHANNELS; chan++)
- {
- build_single_table(psg->intf->res_load[chan], psg->par, normalize, psg->vol_table[chan], psg->zero_is_off);
- build_single_table(psg->intf->res_load[chan], psg->par_env, normalize, psg->env_table[chan], 0);
- }
- }
+ if ((psg->intf->flags & AY8910_RESISTOR_OUTPUT) != 0)
+ {
+ for (chan=0; chan < NUM_CHANNELS; chan++)
+ {
+ build_resisor_table(psg->par, psg->vol_table[chan], psg->zero_is_off);
+ build_resisor_table(psg->par_env, psg->env_table[chan], 0);
+ }
+ }
+ else
+ {
+ for (chan=0; chan < NUM_CHANNELS; chan++)
+ {
+ build_single_table(psg->intf->res_load[chan], psg->par, normalize, psg->vol_table[chan], psg->zero_is_off);
+ build_single_table(psg->intf->res_load[chan], psg->par_env, normalize, psg->env_table[chan], 0);
+ }
+ }
/*
* The previous implementation added all three channels up instead of averaging them.
* The factor of 3 will force the same levels if normalizing is used.
diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c
index 7f924ebece0..2b8a42d0184 100644
--- a/src/emu/sound/cdp1869.c
+++ b/src/emu/sound/cdp1869.c
@@ -369,7 +369,7 @@ MACHINE_CONFIG_END
machine_config_constructor cdp1869_device::device_mconfig_additions() const
{
- return MACHINE_CONFIG_NAME( cdp1869 );
+ return MACHINE_CONFIG_NAME( cdp1869 );
}
diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h
index 39cefd391c7..0c9b1ee1155 100644
--- a/src/emu/sound/cdp1869.h
+++ b/src/emu/sound/cdp1869.h
@@ -202,7 +202,7 @@ public:
static void static_set_char_ram_write(device_t &device, cdp1869_char_ram_write_delegate callback) { downcast<cdp1869_device &>(device).m_out_char_ram_func = callback; }
static void static_set_pcb_read(device_t &device, cdp1869_pcb_read_delegate callback) { downcast<cdp1869_device &>(device).m_in_pcb_func = callback; }
static void static_set_color_clock(device_t &device, int color_clock) { downcast<cdp1869_device &>(device).m_color_clock = color_clock; }
-
+
DECLARE_PALETTE_INIT(cdp1869);
virtual DECLARE_ADDRESS_MAP(io_map, 8);
@@ -228,7 +228,7 @@ public:
protected:
// device-level overrides
- virtual machine_config_constructor device_mconfig_additions() const;
+ virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_start();
virtual void device_post_load();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
diff --git a/src/emu/sound/dmadac.c b/src/emu/sound/dmadac.c
index 3b1f23dceda..7dab612ea64 100644
--- a/src/emu/sound/dmadac.c
+++ b/src/emu/sound/dmadac.c
@@ -46,7 +46,6 @@
void dmadac_sound_device::device_start()
{
-
/* allocate a clear a buffer */
m_buffer = auto_alloc_array_clear(machine(), INT16, BUFFER_SIZE);
@@ -186,7 +185,7 @@ void dmadac_set_volume(dmadac_sound_device **devlist, UINT8 num_channels, UINT16
/* flush out as much data as we can */
for (i = 0; i < num_channels; i++)
- {
+ {
devlist[i]->set_volume(volume);
}
}
diff --git a/src/emu/sound/dmadac.h b/src/emu/sound/dmadac.h
index 917f6fb5ce0..65bfe16b3ff 100644
--- a/src/emu/sound/dmadac.h
+++ b/src/emu/sound/dmadac.h
@@ -24,7 +24,7 @@ public:
void enable(UINT8 enable);
void set_frequency(double frequency);
void set_volume(UINT16 volume);
-
+
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c
index 1bbf3cc411a..5b1433fdfd2 100644
--- a/src/emu/sound/es5503.c
+++ b/src/emu/sound/es5503.c
@@ -235,7 +235,7 @@ void es5503_device::device_start()
m_irq_func.resolve_safe();
m_adc_func.resolve_safe(0);
-
+
rege0 = 0xff;
for (osc = 0; osc < 32; osc++)
diff --git a/src/emu/sound/es5503.h b/src/emu/sound/es5503.h
index 17189eb19a6..1d649713b1d 100644
--- a/src/emu/sound/es5503.h
+++ b/src/emu/sound/es5503.h
@@ -13,7 +13,7 @@
#define MCFG_ES5503_IRQ_FUNC(_write) \
devcb = &es5503_device::static_set_irqf(*device, DEVCB2_##_write);
-
+
#define MCFG_ES5503_ADC_FUNC(_read) \
devcb = &es5503_device::static_set_adcf(*device, DEVCB2_##_read);
@@ -31,7 +31,7 @@ public:
template<class _Object> static devcb2_base &static_set_irqf(device_t &device, _Object object) { return downcast<es5503_device &>(device).m_irq_func.set_callback(object); }
template<class _Object> static devcb2_base &static_set_adcf(device_t &device, _Object object) { return downcast<es5503_device &>(device).m_adc_func.set_callback(object); }
-
+
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
@@ -53,8 +53,8 @@ protected:
const address_space_config m_space_config;
- devcb2_write_line m_irq_func;
- devcb2_read8 m_adc_func;
+ devcb2_write_line m_irq_func;
+ devcb2_read8 m_adc_func;
emu_timer *m_sync_timer;
diff --git a/src/emu/sound/ics2115.c b/src/emu/sound/ics2115.c
index 12fe8c7e18a..1fc4e175c8a 100644
--- a/src/emu/sound/ics2115.c
+++ b/src/emu/sound/ics2115.c
@@ -30,7 +30,7 @@ void ics2115_device::device_start()
m_timer[0].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ics2115_device::timer_cb_0),this), this);
m_timer[1].timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ics2115_device::timer_cb_1),this), this);
m_stream = machine().sound().stream_alloc(*this, 0, 2, 33075);
-
+
m_irq_cb.resolve_safe();
//Exact formula as per patent 5809466
diff --git a/src/emu/sound/k007232.h b/src/emu/sound/k007232.h
index 17490780d80..6da2790a24b 100644
--- a/src/emu/sound/k007232.h
+++ b/src/emu/sound/k007232.h
@@ -12,14 +12,14 @@
#define MCFG_K007232_PORT_WRITE_HANDLER(_devcb) \
devcb = &k007232_device::set_port_write_handler(*device, DEVCB2_##_devcb);
-
+
class k007232_device : public device_t,
public device_sound_interface
{
public:
k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~k007232_device() {}
-
+
template<class _Object> static devcb2_base &set_port_write_handler(device_t &device, _Object object) { return downcast<k007232_device &>(device).m_port_write_handler.set_callback(object); }
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/sound/mos6560.h b/src/emu/sound/mos6560.h
index 68dc107518e..53de3ba8a0c 100644
--- a/src/emu/sound/mos6560.h
+++ b/src/emu/sound/mos6560.h
@@ -138,7 +138,7 @@ class mos6560_device : public device_t,
public:
mos6560_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
mos6560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
template<class _Object> static devcb2_base &set_potx_rd_callback(device_t &device, _Object object) { return downcast<mos6560_device &>(device).m_read_potx.set_callback(object); }
template<class _Object> static devcb2_base &set_poty_rd_callback(device_t &device, _Object object) { return downcast<mos6560_device &>(device).m_read_poty.set_callback(object); }
diff --git a/src/emu/sound/msm5205.h b/src/emu/sound/msm5205.h
index 6d034da3de5..2b11592e39b 100644
--- a/src/emu/sound/msm5205.h
+++ b/src/emu/sound/msm5205.h
@@ -35,7 +35,7 @@
#define MCFG_MSM6585_VCLK_CB(_devcb) \
devcb = &msm6585_device::set_vclk_callback(*device, DEVCB2_##_devcb);
-
+
class msm5205_device : public device_t,
public device_sound_interface
@@ -44,7 +44,7 @@ public:
msm5205_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
msm5205_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~msm5205_device() {}
-
+
static void set_prescaler_selector(device_t &device, int select) { downcast<msm5205_device &>(device).m_select = select; }
template<class _Object> static devcb2_base &set_vclk_callback(device_t &device, _Object object) { return downcast<msm5205_device &>(device).m_vclk_cb.set_callback(object); }
diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c
index 71a9a89b875..fadae1a6ae7 100644
--- a/src/emu/sound/msm5232.c
+++ b/src/emu/sound/msm5232.c
@@ -26,7 +26,7 @@ void msm5232_device::device_start()
{
int rate = clock()/CLOCK_RATE_DIVIDER;
int voicenum;
-
+
m_gate_handler_cb.resolve();
init(clock(), rate);
diff --git a/src/emu/sound/msm5232.h b/src/emu/sound/msm5232.h
index ad5b3e92e2b..febcca4f1f2 100644
--- a/src/emu/sound/msm5232.h
+++ b/src/emu/sound/msm5232.h
@@ -6,7 +6,7 @@
#define MCFG_MSM5232_SET_CAPACITORS(_a, _b, _c, _d, _e, _f, _g, _h) \
msm5232_device::static_set_capacitors(*device, _a, _b, _c, _d, _e, _f, _g, _h);
-
+
#define MCFG_MSM5232_GATE_HANDLER_CB(_devcb) \
devcb = &msm5232_device::set_gate_handler_callback(*device, DEVCB2_##_devcb);
@@ -45,7 +45,7 @@ class msm5232_device : public device_t,
public:
msm5232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~msm5232_device() {}
-
+
static void static_set_capacitors(device_t &device, double cap1, double cap2, double cap3, double cap4, double cap5, double cap6, double cap7, double cap8);
template<class _Object> static devcb2_base &set_gate_handler_callback(device_t &device, _Object object) { return downcast<msm5232_device &>(device).m_gate_handler_cb.set_callback(object); }
diff --git a/src/emu/sound/qs1000.c b/src/emu/sound/qs1000.c
index 59a7be87f1e..4034e94e48f 100644
--- a/src/emu/sound/qs1000.c
+++ b/src/emu/sound/qs1000.c
@@ -239,7 +239,7 @@ void qs1000_device::device_start()
m_out_p1_cb.resolve_safe();
m_out_p2_cb.resolve_safe();
m_out_p3_cb.resolve_safe();
-
+
//m_serial_w_cb.resolve_safe();
m_cpu->i8051_set_serial_rx_callback(read8_delegate(FUNC(qs1000_device::data_to_i8052),this));
diff --git a/src/emu/sound/qs1000.h b/src/emu/sound/qs1000.h
index 5cf0623d5ae..6f8c1ac1977 100644
--- a/src/emu/sound/qs1000.h
+++ b/src/emu/sound/qs1000.h
@@ -38,9 +38,9 @@
#define MCFG_QS1000_OUT_P3_CB(_devcb) \
devcb = &qs1000_device::set_out_p3_callback(*device, DEVCB2_##_devcb);
-
+
/*#define MCFG_QS1000_SERIAL_W_CB(_devcb) \
- devcb = &qs1000_device::set_serial_w_callback(*device, DEVCB2_##_devcb);*/
+ devcb = &qs1000_device::set_serial_w_callback(*device, DEVCB2_##_devcb);*/
//**************************************************************************
// TYPE DEFINITIONS
@@ -67,7 +67,7 @@ public:
template<class _Object> static devcb2_base &set_out_p2_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_out_p2_cb.set_callback(object); }
template<class _Object> static devcb2_base &set_out_p3_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_out_p3_cb.set_callback(object); }
//template<class _Object> static devcb2_base &set_serial_w_callback(device_t &device, _Object object) { return downcast<qs1000_device &>(device).m_serial_w_cb.set_callback(object); }
-
+
// external
void serial_in(UINT8 data);
void set_irq(int state);
@@ -113,7 +113,7 @@ public:
void set_voice_regs(int ch);
bool m_external_rom;
-
+
// Callbacks
devcb2_read8 m_in_p1_cb;
devcb2_read8 m_in_p2_cb;
diff --git a/src/emu/sound/qsound.c b/src/emu/sound/qsound.c
index 2a2e8fb9c0b..51ac2e769b6 100644
--- a/src/emu/sound/qsound.c
+++ b/src/emu/sound/qsound.c
@@ -11,7 +11,7 @@
Many thanks to CAB (the author of Amuse), without whom this probably would
never have been finished.
-
+
TODO:
- hook up the DSP!
- is master volume really linear?
@@ -116,7 +116,7 @@ void qsound_device::device_start()
// create pan table
for (int i = 0; i < 33; i++)
m_pan_table[i] = (int)((256 / sqrt(32.0)) * sqrt((double)i));
-
+
// init sound regs
memset(m_channel, 0, sizeof(m_channel));
@@ -165,18 +165,18 @@ void qsound_device::sound_stream_update(sound_stream &stream, stream_sample_t **
m_channel[ch].address += (m_channel[ch].step_ptr >> 12);
m_channel[ch].step_ptr &= 0xfff;
m_channel[ch].step_ptr += m_channel[ch].freq;
-
+
if (m_channel[ch].address >= m_channel[ch].end)
{
if (m_channel[ch].loop)
{
// Reached the end, restart the loop
m_channel[ch].address -= m_channel[ch].loop;
-
+
// Make sure we don't overflow (what does the real chip do in this case?)
if (m_channel[ch].address >= m_channel[ch].end)
m_channel[ch].address = m_channel[ch].end - m_channel[ch].loop;
-
+
m_channel[ch].address &= 0xffff;
}
else
@@ -186,7 +186,7 @@ void qsound_device::sound_stream_update(sound_stream &stream, stream_sample_t **
break;
}
}
-
+
INT8 sample = read_sample(m_channel[ch].bank | m_channel[ch].address);
*lmix++ += ((sample * m_channel[ch].lvol * m_channel[ch].vol) >> 14);
*rmix++ += ((sample * m_channel[ch].rvol * m_channel[ch].vol) >> 14);
@@ -237,7 +237,7 @@ void qsound_device::write_data(UINT8 address, UINT16 data)
ch = address >> 3;
reg = address & 7;
}
-
+
// >= 0x80 is probably for the dsp?
else if (address < 0x90)
{
@@ -312,12 +312,12 @@ void qsound_device::write_data(UINT8 address, UINT16 data)
pan = 0x20;
if (pan < 0)
pan = 0;
-
+
m_channel[ch].rvol = m_pan_table[pan];
m_channel[ch].lvol = m_pan_table[0x20 - pan];
break;
}
-
+
case 9:
// unknown
break;
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index 5d429d8442e..12553092b23 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -173,7 +173,7 @@ scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_
memset(m_MidiStack, 0, sizeof(m_MidiStack));
memset(m_LPANTABLE, 0, sizeof(m_LPANTABLE));
memset(m_RPANTABLE, 0, sizeof(m_RPANTABLE));
- memset(m_TimPris, 0, sizeof(m_TimPris));
+ memset(m_TimPris, 0, sizeof(m_TimPris));
memset(m_ARTABLE, 0, sizeof(m_ARTABLE));
memset(m_DRTABLE, 0, sizeof(m_DRTABLE));
memset(m_EG_TABLE, 0, sizeof(m_EG_TABLE));
@@ -187,8 +187,8 @@ scsp_device::scsp_device(const machine_config &mconfig, const char *tag, device_
memset(m_ALFO_NOI, 0, sizeof(m_ALFO_NOI));
memset(m_PSCALES, 0, sizeof(m_PSCALES));
memset(m_ASCALES, 0, sizeof(m_ASCALES));
- memset(&m_Slots, 0, sizeof(m_Slots));
- memset(&m_udata.data, 0, sizeof(m_udata.data));
+ memset(&m_Slots, 0, sizeof(m_Slots));
+ memset(&m_udata.data, 0, sizeof(m_udata.data));
m_TimCnt[0] = 0;
m_TimCnt[1] = 0;
m_TimCnt[2] = 0;
@@ -205,7 +205,7 @@ void scsp_device::device_start()
// set up the IRQ callbacks
m_irq_cb.resolve_safe();
- m_main_irq_cb.resolve_safe();
+ m_main_irq_cb.resolve_safe();
m_stream = machine().sound().stream_alloc(*this, 0, 2, 44100, this);
}
@@ -219,7 +219,7 @@ void scsp_device::sound_stream_update(sound_stream &stream, stream_sample_t **in
m_bufferl = outputs[0];
m_bufferr = outputs[1];
m_length = samples;
- DoMasterSamples(samples);
+ DoMasterSamples(samples);
}
unsigned char scsp_device::DecodeSCI(unsigned char irq)
@@ -937,7 +937,7 @@ void scsp_device::w16(address_space &space,unsigned int addr,unsigned short val)
*((unsigned short *) (m_DSP.COEF+(addr-0x700)/2))=val;
else if(addr<0x7c0)
*((unsigned short *) (m_DSP.MADRS+(addr-0x780)/2))=val;
- else if(addr<0x800) // MADRS is mirrored twice
+ else if(addr<0x800) // MADRS is mirrored twice
*((unsigned short *) (m_DSP.MADRS+(addr-0x7c0)/2))=val;
else if(addr<0xC00)
{
diff --git a/src/emu/sound/scsp.h b/src/emu/sound/scsp.h
index cd66eb8f6c8..7c7e200cf3f 100644
--- a/src/emu/sound/scsp.h
+++ b/src/emu/sound/scsp.h
@@ -21,10 +21,10 @@
#define MCFG_SCSP_MAIN_IRQ_CB(_devcb) \
devcb = &scsp_device::set_main_irq_callback(*device, DEVCB2_##_devcb);
-
+
enum SCSP_STATE {SCSP_ATTACK,SCSP_DECAY1,SCSP_DECAY2,SCSP_RELEASE};
-
+
struct SCSP_EG_t
{
int volume; //
@@ -56,7 +56,7 @@ struct SCSP_SLOT
UINT16 data[0x10]; //only 0x1a bytes used
UINT8 datab[0x20];
} udata;
-
+
UINT8 Backwards; //the wave is playing backwards
UINT8 active; //this slot is currently playing
UINT8 *base; //samples base address
@@ -76,7 +76,7 @@ class scsp_device : public device_t,
{
public:
scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
static void set_roffset(device_t &device, int roffset) { downcast<scsp_device &>(device).m_roffset = roffset; }
template<class _Object> static devcb2_base &set_irq_callback(device_t &device, _Object object) { return downcast<scsp_device &>(device).m_irq_cb.set_callback(object); }
template<class _Object> static devcb2_base &set_main_irq_callback(device_t &device, _Object object) { return downcast<scsp_device &>(device).m_main_irq_cb.set_callback(object); }
@@ -88,7 +88,7 @@ public:
// MIDI I/O access (used for comms on Model 2/3)
DECLARE_WRITE16_MEMBER( midi_in );
DECLARE_READ16_MEMBER( midi_out_r );
-
+
void set_ram_base(void *base);
protected:
@@ -97,18 +97,18 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
private:
int m_roffset; /* offset in the region */
- devcb2_write8 m_irq_cb; /* irq callback */
+ devcb2_write8 m_irq_cb; /* irq callback */
devcb2_write_line m_main_irq_cb;
-
+
union
{
UINT16 data[0x30/2];
UINT8 datab[0x30];
} m_udata;
-
+
SCSP_SLOT m_Slots[32];
signed short m_RINGBUF[128];
unsigned char m_BUFPTR;
@@ -130,7 +130,7 @@ private:
UINT8 m_MidiOutW, m_MidiOutR;
UINT8 m_MidiStack[32];
UINT8 m_MidiW, m_MidiR;
-
+
INT32 m_EG_TABLE[0x400];
int m_LPANTABLE[0x10000];
@@ -158,20 +158,20 @@ private:
int m_ARTABLE[64], m_DRTABLE[64];
SCSPDSP m_DSP;
-
+
stream_sample_t *m_bufferl;
stream_sample_t *m_bufferr;
int m_length;
signed short *m_RBUFDST; //this points to where the sample will be stored in the RingBuf
-
+
//LFO
int m_PLFO_TRI[256], m_PLFO_SQR[256], m_PLFO_SAW[256], m_PLFO_NOI[256];
int m_ALFO_TRI[256], m_ALFO_SQR[256], m_ALFO_SAW[256], m_ALFO_NOI[256];
int m_PSCALES[8][256];
int m_ASCALES[8][256];
-
+
void exec_dma(address_space &space); /*state DMA transfer function*/
unsigned char DecodeSCI(unsigned char irq);
void CheckPendingIRQ();
@@ -198,7 +198,7 @@ private:
unsigned short r16(address_space &space, unsigned int addr);
inline INT32 UpdateSlot(SCSP_SLOT *slot);
void DoMasterSamples(int nsamples);
-
+
//LFO
void LFO_Init();
signed int PLFO_Step(SCSP_LFO_t *LFO);
diff --git a/src/emu/sound/sp0256.h b/src/emu/sound/sp0256.h
index 2ea19f29c65..2f93af5836b 100644
--- a/src/emu/sound/sp0256.h
+++ b/src/emu/sound/sp0256.h
@@ -74,10 +74,10 @@ class sp0256_device : public device_t,
public:
sp0256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~sp0256_device() { }
-
+
template<class _Object> static devcb2_base &set_data_request_callback(device_t &device, _Object object) { return downcast<sp0256_device &>(device).m_drq_cb.set_callback(object); }
template<class _Object> static devcb2_base &set_standby_callback(device_t &device, _Object object) { return downcast<sp0256_device &>(device).m_sby_cb.set_callback(object); }
-
+
DECLARE_WRITE8_MEMBER(ald_w);
DECLARE_READ_LINE_MEMBER(lrq_r);
DECLARE_READ_LINE_MEMBER(sby_r);
@@ -101,8 +101,8 @@ private:
void micro();
sound_stream *m_stream; /* MAME core sound stream */
- devcb2_write_line m_drq_cb; /* Data request callback */
- devcb2_write_line m_sby_cb; /* Standby callback */
+ devcb2_write_line m_drq_cb; /* Data request callback */
+ devcb2_write_line m_sby_cb; /* Standby callback */
int m_sby_line; /* Standby line state */
int m_cur_len; /* Fullness of current sound buffer. */
diff --git a/src/emu/sound/spu.c b/src/emu/sound/spu.c
index 808b1180ae8..f6ee4e95a49 100644
--- a/src/emu/sound/spu.c
+++ b/src/emu/sound/spu.c
@@ -138,13 +138,13 @@ static const unsigned int /*sound_buffer_size=65536*4,*/
output_buffer_size=65536/8/*,
- sample_loop_cache_pool_size=64,
- sample_loop_cache_extend_size=64,
- sample_cache_pool_size=64,
- sample_cache_extend_size=64,
+ sample_loop_cache_pool_size=64,
+ sample_loop_cache_extend_size=64,
+ sample_cache_pool_size=64,
+ sample_cache_extend_size=64,
- stream_marker_pool_size=64,
- stream_marker_extend_size=64*/;
+ stream_marker_pool_size=64,
+ stream_marker_extend_size=64*/;
//
//
diff --git a/src/emu/sound/tc8830f.c b/src/emu/sound/tc8830f.c
index 07a8d9ca27c..3ef03fb8578 100644
--- a/src/emu/sound/tc8830f.c
+++ b/src/emu/sound/tc8830f.c
@@ -111,22 +111,22 @@ void tc8830f_device::sound_stream_update(sound_stream &stream, stream_sample_t *
m_delta -= 8;
if (m_delta <= 0)
m_delta = 1;
-
+
// determine direction
if (bit)
m_output += m_delta;
else
m_output -= m_delta;
-
+
if (m_output > 32767)
m_output = 32767;
else if (m_output < -32768)
m_output = -32768;
-
+
m_prevbits = m_prevbits << 1 | bit;
mix = m_output;
}
-
+
outputs[0][i] = mix;
}
}
diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c
index 68788ae5861..11305f49533 100644
--- a/src/emu/sound/upd7759.c
+++ b/src/emu/sound/upd7759.c
@@ -220,7 +220,7 @@ void upd775x_device::device_start()
void upd7759_device::device_start()
{
m_drqcallback.resolve_safe();
-
+
/* chip configuration */
m_sample_offset_shift = (type() == UPD7759) ? 1 : 0;
@@ -295,7 +295,7 @@ void upd7759_device::device_start()
void upd7756_device::device_start()
{
m_drqcallback.resolve_safe();
-
+
/* chip configuration */
m_sample_offset_shift = (type() == UPD7759) ? 1 : 0;
diff --git a/src/emu/sound/upd7759.h b/src/emu/sound/upd7759.h
index ae315315bbb..a711df62a31 100644
--- a/src/emu/sound/upd7759.h
+++ b/src/emu/sound/upd7759.h
@@ -22,7 +22,7 @@ public:
~upd775x_device() {}
template<class _Object> static devcb2_base &set_drq_callback(device_t &device, _Object object) { return downcast<upd775x_device &>(device).m_drqcallback.set_callback(object); }
-
+
void set_bank_base(offs_t base);
void reset_w(UINT8 data);
@@ -82,7 +82,7 @@ protected:
UINT32 m_rommask; /* maximum address offset */
devcb2_write_line m_drqcallback;
-
+
void update_adpcm(int data);
void advance_state();
};
diff --git a/src/emu/sound/votrax.h b/src/emu/sound/votrax.h
index 85acea086d2..38a31ae4d58 100644
--- a/src/emu/sound/votrax.h
+++ b/src/emu/sound/votrax.h
@@ -38,7 +38,7 @@ public:
votrax_sc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _Object> static devcb2_base &set_request_callback(device_t &device, _Object object) { return downcast<votrax_sc01_device &>(device).m_request_cb.set_callback(object); }
-
+
// writers
DECLARE_WRITE8_MEMBER( write );
DECLARE_WRITE8_MEMBER( inflection_w );
@@ -73,7 +73,7 @@ private:
UINT8 m_phoneme; // 6-bit phoneme value
// outputs
- devcb2_write_line m_request_cb; // callback for request
+ devcb2_write_line m_request_cb; // callback for request
UINT8 m_request_state; // request as seen to the outside world
UINT8 m_internal_request; // request managed by stream timing
diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c
index b2b7797a88a..c869a6f689a 100644
--- a/src/emu/sound/ymf278b.c
+++ b/src/emu/sound/ymf278b.c
@@ -267,7 +267,7 @@ void ymf278b_device::sound_stream_update(sound_stream &stream, stream_sample_t *
if (slot->stepptr >= slot->endaddr)
{
slot->stepptr = slot->stepptr - slot->endaddr + slot->loopaddr;
-
+
// NOTE: loop overflow is still possible here if (slot->stepptr >= slot->endaddr)
// This glitch may be (ab)used to your advantage to create pseudorandom noise.
}
diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c
index 597f9f5b64f..683937a3511 100644
--- a/src/emu/sound/ymz280b.c
+++ b/src/emu/sound/ymz280b.c
@@ -505,7 +505,7 @@ void ymz280b_device::sound_stream_update(sound_stream &stream, stream_sample_t *
if (samples_left || voice->ended)
{
voice->ended = false;
-
+
/* if there are leftovers, ramp back to 0 */
int base = new_samples - samples_left;
int i, t = (base == 0) ? curr : m_scratch[base - 1];
diff --git a/src/emu/sound/zsg2.c b/src/emu/sound/zsg2.c
index 19766e0ecc6..b9dd8bd3272 100644
--- a/src/emu/sound/zsg2.c
+++ b/src/emu/sound/zsg2.c
@@ -89,10 +89,10 @@ void zsg2_device::device_start()
m_mem_base = *region();
m_mem_size = region()->bytes();
m_mem_blocks = m_mem_size / 4;
-
+
m_mem_copy = auto_alloc_array_clear(machine(), UINT32, m_mem_blocks);
m_full_samples = auto_alloc_array_clear(machine(), INT16, m_mem_blocks * 4 + 4); // +4 is for empty block
-
+
// register for savestates
save_pointer(NAME(m_mem_copy), m_mem_blocks / sizeof(UINT32));
save_pointer(NAME(m_full_samples), (m_mem_blocks * 4 + 4) / sizeof(INT16));
@@ -129,7 +129,7 @@ void zsg2_device::device_reset()
control_w(4, 0xffff);
control_w(5, 0xffff);
control_w(6, 0xffff);
-
+
for (int ch = 0; ch < 48; ch++)
for (int reg = 0; reg < 0x10; reg++)
chan_w(ch, reg, 0);
@@ -155,20 +155,20 @@ INT16 *zsg2_device::prepare_samples(UINT32 offset)
if (block == 0)
return &m_full_samples[m_mem_blocks]; // overflow or 0
-
+
if (block == m_mem_copy[offset])
return &m_full_samples[offset * 4]; // cached
-
+
m_mem_copy[offset] = block;
offset *= 4;
-
+
// decompress 32 byte block to 4 16-bit samples
// 42222222 51111111 60000000 ssss3333
m_full_samples[offset|0] = block >> 8 & 0x7f;
m_full_samples[offset|1] = block >> 16 & 0x7f;
m_full_samples[offset|2] = block >> 24 & 0x7f;
m_full_samples[offset|3] = (block >> (8+1) & 0x40) | (block >> (16+2) & 0x20) | (block >> (24+3) & 0x10) | (block & 0xf);
-
+
// sign-extend and shift
UINT8 shift = block >> 4 & 0xf;
for (int i = offset; i < (offset + 4); i++)
@@ -176,7 +176,7 @@ INT16 *zsg2_device::prepare_samples(UINT32 offset)
m_full_samples[i] <<= 9;
m_full_samples[i] >>= shift;
}
-
+
return &m_full_samples[offset];
}
@@ -197,7 +197,7 @@ void zsg2_device::sound_stream_update(sound_stream &stream, stream_sample_t **in
{
if (!m_chan[ch].is_playing)
continue;
-
+
m_chan[ch].step_ptr += m_chan[ch].step;
if (m_chan[ch].step_ptr & 0x40000)
{
@@ -215,9 +215,9 @@ void zsg2_device::sound_stream_update(sound_stream &stream, stream_sample_t **in
}
m_chan[ch].samples = prepare_samples(m_chan[ch].page | m_chan[ch].cur_pos);
}
-
+
INT32 sample = (m_chan[ch].samples[m_chan[ch].step_ptr >> 16 & 3] * m_chan[ch].vol) >> 16;
-
+
mix_l += (sample * m_chan[ch].panl + sample * (0x1f - m_chan[ch].panr)) >> 5;
mix_r += (sample * m_chan[ch].panr + sample * (0x1f - m_chan[ch].panl)) >> 5;
}
@@ -246,15 +246,15 @@ void zsg2_device::chan_w(int ch, int reg, UINT16 data)
m_chan[ch].start_pos = (m_chan[ch].start_pos & 0x00ff) | (data << 8 & 0xff00);
m_chan[ch].page = data << 8 & 0xff0000;
break;
-
+
case 0x2:
// no function? always 0
break;
-
+
case 0x3:
// unknown, always 0x0400
break;
-
+
case 0x4:
// frequency
m_chan[ch].step = data + 1;
@@ -266,7 +266,7 @@ void zsg2_device::chan_w(int ch, int reg, UINT16 data)
m_chan[ch].loop_pos = (m_chan[ch].loop_pos & 0xff00) | (data & 0xff);
m_chan[ch].panr = data >> 8 & 0x1f;
break;
-
+
case 0x6:
// end address
m_chan[ch].end_pos = data;
@@ -278,26 +278,26 @@ void zsg2_device::chan_w(int ch, int reg, UINT16 data)
m_chan[ch].loop_pos = (m_chan[ch].loop_pos & 0x00ff) | (data << 8 & 0xff00);
m_chan[ch].panl = data >> 8 & 0x1f;
break;
-
+
case 0x9:
// no function? always 0
break;
-
+
case 0xb:
// always writes 0
// this register is read-only
break;
-
+
case 0xe:
// volume
m_chan[ch].vol = data;
break;
-
+
case 0xf:
// flags
m_chan[ch].flags = data;
break;
-
+
default:
break;
}
@@ -316,7 +316,7 @@ UINT16 zsg2_device::chan_r(int ch, int reg)
default:
break;
}
-
+
return m_chan[ch].v[reg];
}
@@ -397,7 +397,7 @@ UINT16 zsg2_device::control_r(int reg)
default:
break;
}
-
+
return 0;
}
diff --git a/src/emu/sound/zsg2.h b/src/emu/sound/zsg2.h
index 5040c5e5370..cf9450128a1 100644
--- a/src/emu/sound/zsg2.h
+++ b/src/emu/sound/zsg2.h
@@ -74,7 +74,7 @@ private:
INT16 *m_full_samples;
sound_stream *m_stream;
-
+
devcb2_read32 m_ext_read_handler;
UINT32 read_memory(UINT32 offset);