summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/sound
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/sound')
-rw-r--r--src/emu/sound/bsmt2000.c20
-rw-r--r--src/emu/sound/bsmt2000.h6
-rw-r--r--src/emu/sound/disc_cls.h14
-rw-r--r--src/emu/sound/disc_dev.h4
-rw-r--r--src/emu/sound/disc_flt.h60
-rw-r--r--src/emu/sound/disc_inp.c2
-rw-r--r--src/emu/sound/disc_mth.c6
-rw-r--r--src/emu/sound/disc_mth.h10
-rw-r--r--src/emu/sound/disc_wav.h14
-rw-r--r--src/emu/sound/discrete.c6
-rw-r--r--src/emu/sound/discrete.h10
-rw-r--r--src/emu/sound/okim6295.c2
-rw-r--r--src/emu/sound/segapcm.c38
13 files changed, 96 insertions, 96 deletions
diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c
index 0bcf51d402f..cf0c776ae50 100644
--- a/src/emu/sound/bsmt2000.c
+++ b/src/emu/sound/bsmt2000.c
@@ -139,7 +139,7 @@ device_t *bsmt2000_device_config::alloc_device(running_machine &machine) const
//-------------------------------------------------
-// static_set_ready_callback - configuration
+// static_set_ready_callback - configuration
// helper to set the ready callback
//-------------------------------------------------
@@ -228,7 +228,7 @@ void bsmt2000_device::device_start()
// internally at 24MHz the max output sample rate is 32kHz
// divided by 128 gives us 6x the max output rate which is plenty for oversampling
m_stream = stream_create(*this, 0, 2, clock() / 128);
-
+
// register for save states
state_save_register_device_item(this, 0, m_register_select);
state_save_register_device_item(this, 0, m_write_data);
@@ -264,12 +264,12 @@ void bsmt2000_device::device_timer(emu_timer &timer, device_timer_id id, int par
stream_update(m_stream);
m_cpu->reset();
break;
-
+
// deferred register write
case TIMER_ID_REG_WRITE:
m_register_select = param & 0xffff;
break;
-
+
// deferred data write
case TIMER_ID_DATA_WRITE:
m_write_data = param & 0xffff;
@@ -307,7 +307,7 @@ UINT16 bsmt2000_device::read_status()
//-------------------------------------------------
-// write_reg - handle writes to the BSMT2000
+// write_reg - handle writes to the BSMT2000
// register select interface
//-------------------------------------------------
@@ -318,14 +318,14 @@ void bsmt2000_device::write_reg(UINT16 data)
//-------------------------------------------------
-// write_data - handle writes to the BSMT2000
+// write_data - handle writes to the BSMT2000
// data port
//-------------------------------------------------
void bsmt2000_device::write_data(UINT16 data)
{
device_timer_call_after_resynch(*this, TIMER_ID_DATA_WRITE, data);
-
+
// boost the interleave on a write so that the caller detects the status more accurately
m_machine.scheduler().boost_interleave(ATTOTIME_IN_USEC(1), ATTOTIME_IN_USEC(10));
}
@@ -343,7 +343,7 @@ READ16_MEMBER( bsmt2000_device::tms_register_r )
//-------------------------------------------------
-// tms_data_r - return the value written to the
+// tms_data_r - return the value written to the
// data port
//-------------------------------------------------
@@ -392,7 +392,7 @@ WRITE16_MEMBER( bsmt2000_device::tms_rom_bank_w )
//-------------------------------------------------
-// tms_left_w - handle writes to the left channel
+// tms_left_w - handle writes to the left channel
// DAC
//-------------------------------------------------
@@ -404,7 +404,7 @@ WRITE16_MEMBER( bsmt2000_device::tms_left_w )
//-------------------------------------------------
-// tms_right_w - handle writes to the right
+// tms_right_w - handle writes to the right
// channel DAC
//-------------------------------------------------
diff --git a/src/emu/sound/bsmt2000.h b/src/emu/sound/bsmt2000.h
index 435f570ec42..4d5ffc76362 100644
--- a/src/emu/sound/bsmt2000.h
+++ b/src/emu/sound/bsmt2000.h
@@ -74,7 +74,7 @@ class bsmt2000_device_config : public device_config,
public device_config_memory_interface
{
friend class bsmt2000_device;
-
+
typedef void (*ready_callback)(bsmt2000_device &device);
// construction/destruction
@@ -98,7 +98,7 @@ protected:
// internal state
const address_space_config m_space_config;
-
+
// inline data
ready_callback m_ready_callback;
};
@@ -126,7 +126,7 @@ protected:
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
-
+
// sound interface overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
diff --git a/src/emu/sound/disc_cls.h b/src/emu/sound/disc_cls.h
index dfb36fea2a0..e6be420716f 100644
--- a/src/emu/sound/disc_cls.h
+++ b/src/emu/sound/disc_cls.h
@@ -15,7 +15,7 @@
*
* Additions/bugfix February 2003 - D.Renaud, F.Palazzolo, K.Wilkins
* Discrete parallel tasks 2009 - Couriersud
- * Discrete classes 2010 - Couriersud
+ * Discrete classes 2010 - Couriersud
*
***********************************************************************/
@@ -25,7 +25,7 @@
#define DISCRETE_CLASS_CONSTRUCTOR(_name, _base) \
public: \
- DISCRETE_CLASS_NAME(_name)() \
+ DISCRETE_CLASS_NAME(_name)() \
: DISCRETE_CLASS_NAME(_base)() { }
#define DISCRETE_CLASS_DESTRUCTOR(_name) \
@@ -45,7 +45,7 @@ private: \
_priv \
}
-#define DISCRETE_CLASS_STEP(_name, _maxout, _priv) \
+#define DISCRETE_CLASS_STEP(_name, _maxout, _priv) \
class DISCRETE_CLASS_NAME(_name): public discrete_base_node, public discrete_step_interface \
{ \
DISCRETE_CLASS_CONSTRUCTOR(_name, base) \
@@ -58,7 +58,7 @@ private: \
_priv \
}
-#define DISCRETE_CLASS_RESET(_name, _maxout) \
+#define DISCRETE_CLASS_RESET(_name, _maxout) \
class DISCRETE_CLASS_NAME(_name): public discrete_base_node \
{ \
DISCRETE_CLASS_CONSTRUCTOR(_name, base) \
@@ -68,7 +68,7 @@ public: \
int max_output(void) { return _maxout; } \
}
-#define DISCRETE_CLASS(_name, _maxout, _priv) \
+#define DISCRETE_CLASS(_name, _maxout, _priv) \
class DISCRETE_CLASS_NAME(_name): public discrete_base_node, public discrete_step_interface \
{ \
DISCRETE_CLASS_DESTRUCTOR(_name) \
@@ -105,7 +105,7 @@ public:
*
*************************************/
-class DISCRETE_CLASS_NAME(dso_output): public discrete_base_node,
+class DISCRETE_CLASS_NAME(dso_output): public discrete_base_node,
public discrete_sound_output_interface,
public discrete_step_interface
{
@@ -238,7 +238,7 @@ private:
UINT8 m_data; /* data written */
UINT8 m_is_buffered;
/* the buffer stream */
- sound_stream *m_buffer_stream;
+ sound_stream *m_buffer_stream;
};
class DISCRETE_CLASS_NAME(dss_input_buffer): public DISCRETE_CLASS_NAME(dss_input_stream)
diff --git a/src/emu/sound/disc_dev.h b/src/emu/sound/disc_dev.h
index e45cdde1e36..1915a47233b 100644
--- a/src/emu/sound/disc_dev.h
+++ b/src/emu/sound/disc_dev.h
@@ -15,7 +15,7 @@
*
* Additions/bugfix February 2003 - D.Renaud, F.Palazzolo, K.Wilkins
* Discrete parallel tasks 2009 - Couriersud
- * Discrete classes 2010 - Couriersud
+ * Discrete classes 2010 - Couriersud
*
***********************************************************************/
@@ -98,7 +98,7 @@ DISCRETE_CLASS_STEP_RESET(dsd_555_vco1, 1,
);
DISCRETE_CLASS_STEP_RESET(dsd_566, 1,
- unsigned int m_state[2]; /* keeps track of excess flip_flop changes during the current step */
+ unsigned int m_state[2]; /* keeps track of excess flip_flop changes during the current step */
int m_flip_flop; /* 566 flip/flop output state */
double m_cap_voltage; /* voltage on cap */
double m_v_sqr_low; /* voltage for a squarewave at low */
diff --git a/src/emu/sound/disc_flt.h b/src/emu/sound/disc_flt.h
index 8a8e586c058..3a62857a8b7 100644
--- a/src/emu/sound/disc_flt.h
+++ b/src/emu/sound/disc_flt.h
@@ -15,7 +15,7 @@
*
* Additions/bugfix February 2003 - D.Renaud, F.Palazzolo, K.Wilkins
* Discrete parallel tasks 2009 - Couriersud
- * Discrete classes 2010 - Couriersud
+ * Discrete classes 2010 - Couriersud
*
***********************************************************************/
@@ -72,35 +72,35 @@ DISCRETE_CLASS_STEP_RESET(dst_op_amp_filt, 1,
);
DISCRETE_CLASS_STEP_RESET(dst_rc_circuit_1, 1,
- double m_v_cap;
- double m_v_charge_1_2;
+ double m_v_cap;
+ double m_v_charge_1_2;
double m_v_drop;
- double m_exp_1;
- double m_exp_1_2;
- double m_exp_2;
+ double m_exp_1;
+ double m_exp_1_2;
+ double m_exp_2;
);
DISCRETE_CLASS_STEP_RESET(dst_rcdisc, 1,
int m_state;
- double m_t; /* time */
- double m_exponent0;
+ double m_t; /* time */
+ double m_exponent0;
);
DISCRETE_CLASS_STEP_RESET(dst_rcdisc2, 1,
int m_state;
double m_v_out;
- double m_t; /* time */
- double m_exponent0;
- double m_exponent1;
+ double m_t; /* time */
+ double m_exponent0;
+ double m_exponent1;
);
DISCRETE_CLASS_STEP_RESET(dst_rcdisc3, 1,
int m_state;
double m_v_out;
- double m_t; /* time */
- double m_exponent0;
- double m_exponent1;
- double m_v_diode; /* rcdisc3 */
+ double m_t; /* time */
+ double m_exponent0;
+ double m_exponent1;
+ double m_v_diode; /* rcdisc3 */
);
DISCRETE_CLASS_STEP_RESET(dst_rcdisc4, 1,
@@ -113,9 +113,9 @@ DISCRETE_CLASS_STEP_RESET(dst_rcdisc4, 1,
DISCRETE_CLASS_STEP_RESET(dst_rcdisc5, 1,
int m_state;
- double m_t; /* time */
- double m_exponent0;
- double m_v_cap; /* rcdisc5 */
+ double m_t; /* time */
+ double m_exponent0;
+ double m_v_cap; /* rcdisc5 */
);
DISCRETE_CLASS_STEP_RESET(dst_rcintegrate, 1,
@@ -130,7 +130,7 @@ DISCRETE_CLASS_STEP_RESET(dst_rcintegrate, 1,
double m_exp_exponent1;
double m_c_exp0;
double m_c_exp1;
- double m_EM_IC_0_7;
+ double m_EM_IC_0_7;
);
DISCRETE_CLASS_STEP_RESET(dst_rcdisc_mod, 1,
@@ -153,25 +153,25 @@ DISCRETE_CLASS_STEP_RESET(dst_rcfilter, 1,
DISCRETE_CLASS_STEP_RESET(dst_rcfilter_sw, 1,
double m_vCap[4];
double m_exp[4];
- double m_exp0; /* fast case bit 0 */
- double m_exp1; /* fast case bit 1 */
- double m_factor; /* fast case */
- double m_f1[16];
- double m_f2[16];
+ double m_exp0; /* fast case bit 0 */
+ double m_exp1; /* fast case bit 1 */
+ double m_factor; /* fast case */
+ double m_f1[16];
+ double m_f2[16];
);
DISCRETE_CLASS_STEP_RESET(dst_rcdiscN, 1,
- double m_x1; /* x[k-1], previous input value */
- double m_y1; /* y[k-1], previous output value */
- double m_a1; /* digital filter coefficients, denominator */
- double m_b[2]; /* digital filter coefficients, numerator */
+ double m_x1; /* x[k-1], previous input value */
+ double m_y1; /* y[k-1], previous output value */
+ double m_a1; /* digital filter coefficients, denominator */
+ double m_b[2]; /* digital filter coefficients, numerator */
);
DISCRETE_CLASS_STEP_RESET(dst_rcdisc2N, 1,
struct discrete_filter_coeff m_fc0;
struct discrete_filter_coeff m_fc1;
- double m_x1;
- double m_y1;
+ double m_x1;
+ double m_y1;
);
diff --git a/src/emu/sound/disc_inp.c b/src/emu/sound/disc_inp.c
index 57aad660197..054d2d485eb 100644
--- a/src/emu/sound/disc_inp.c
+++ b/src/emu/sound/disc_inp.c
@@ -23,7 +23,7 @@
READ8_DEVICE_HANDLER(discrete_sound_r)
{
discrete_device *disc_device = downcast<discrete_device *>(device);
- return disc_device->read( *disc_device->machine->firstcpu->space(), offset, 0xff);
+ return disc_device->read( *disc_device->machine->firstcpu->space(), offset, 0xff);
}
diff --git a/src/emu/sound/disc_mth.c b/src/emu/sound/disc_mth.c
index b04af0f0c0b..65cb10b2fff 100644
--- a/src/emu/sound/disc_mth.c
+++ b/src/emu/sound/disc_mth.c
@@ -1585,7 +1585,7 @@ DISCRETE_STEP(dst_transform)
{
switch (*fPTR++)
{
- case TOK_MULT: top = stack.pop() * top; break;
+ case TOK_MULT: top = stack.pop() * top; break;
case TOK_DIV: top = stack.pop() / top; break;
case TOK_ADD: top = stack.pop() + top; break;
case TOK_MINUS: top = stack.pop() - top; break;
@@ -1630,7 +1630,7 @@ DISCRETE_RESET(dst_transform)
case '4': *p = TOK_4; break;
case 'P': *p = TOK_DUP; break;
case 'a': *p = TOK_ABS; break; /* absolute value */
- case 'i': *p = TOK_NEG; break; /* * -1 */
+ case 'i': *p = TOK_NEG; break; /* * -1 */
case '!': *p = TOK_NOT; break; /* Logical NOT of Last Value */
case '=': *p = TOK_EQUAL; break; /* Logical = */
case '>': *p = TOK_GREATER; break; /* Logical > */
@@ -1863,7 +1863,7 @@ DISCRETE_STEP(dst_tvca_op_amp)
double i_pos = 0; /* current into + input */
double i_out = 0; /* current at output */
- double v_out;
+ double v_out;
trig0 = (int)DST_TVCA_OP_AMP__TRG0;
trig1 = (int)DST_TVCA_OP_AMP__TRG1;
diff --git a/src/emu/sound/disc_mth.h b/src/emu/sound/disc_mth.h
index ad797345567..5debe62bfb6 100644
--- a/src/emu/sound/disc_mth.h
+++ b/src/emu/sound/disc_mth.h
@@ -15,7 +15,7 @@
*
* Additions/bugfix February 2003 - D.Renaud, F.Palazzolo, K.Wilkins
* Discrete parallel tasks 2009 - Couriersud
- * Discrete classes 2010 - Couriersud
+ * Discrete classes 2010 - Couriersud
*
***********************************************************************/
@@ -56,7 +56,7 @@ DISCRETE_CLASS_STEP_RESET(dst_logic_dff, 1,
);
DISCRETE_CLASS_STEP_RESET(dst_logic_jkff, 1,
- double m_v_out;
+ double m_v_out;
int m_last_clk;
);
@@ -91,7 +91,7 @@ DISCRETE_CLASS_STEP_RESET(dst_ramp, 1,
);
DISCRETE_CLASS_STEP_RESET(dst_samphold, 1,
- double m_last_input;
+ double m_last_input;
int m_clocktype;
);
@@ -118,13 +118,13 @@ public:
TOK_4,
TOK_DUP,
TOK_ABS, /* absolute value */
- TOK_NEG, /* * -1 */
+ TOK_NEG, /* * -1 */
TOK_NOT, /* Logical NOT of Last Value */
TOK_EQUAL, /* Logical = */
TOK_GREATER, /* Logical > */
TOK_LESS, /* Logical < */
TOK_AND, /* Bitwise AND */
- TOK_OR, /* Bitwise OR */
+ TOK_OR, /* Bitwise OR */
TOK_XOR /* Bitwise XOR */
};
void step(void);
diff --git a/src/emu/sound/disc_wav.h b/src/emu/sound/disc_wav.h
index 0bbde51d10b..2c711205a13 100644
--- a/src/emu/sound/disc_wav.h
+++ b/src/emu/sound/disc_wav.h
@@ -15,7 +15,7 @@
*
* Additions/bugfix February 2003 - D.Renaud, F.Palazzolo, K.Wilkins
* Discrete parallel tasks 2009 - Couriersud
- * Discrete classes 2010 - Couriersud
+ * Discrete classes 2010 - Couriersud
*
***********************************************************************/
@@ -48,7 +48,7 @@ DISCRETE_CLASS_STEP_RESET(dss_lfsr_noise, 2,
);
DISCRETE_CLASS_STEP_RESET(dss_noise, 2,
- double m_phase;
+ double m_phase;
);
DISCRETE_CLASS_STEP_RESET(dss_note, 1,
@@ -128,12 +128,12 @@ protected:
inline double tftab(double x);
inline double tf(double x);
private:
- DISCRETE_CLASS_INPUT(I_ENABLE, 0);
+ DISCRETE_CLASS_INPUT(I_ENABLE, 0);
DISCRETE_CLASS_INPUT(I_MOD, 1);
- DISCRETE_CLASS_INPUT(I_RC, 2);
- DISCRETE_CLASS_INPUT(I_RP, 3);
- DISCRETE_CLASS_INPUT(I_C, 4);
- DISCRETE_CLASS_INPUT(I_R2, 5);
+ DISCRETE_CLASS_INPUT(I_RC, 2);
+ DISCRETE_CLASS_INPUT(I_RP, 3);
+ DISCRETE_CLASS_INPUT(I_C, 4);
+ DISCRETE_CLASS_INPUT(I_R2, 5);
double mc_v_cap;
double mc_v_g2_old;
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index c1477911f09..4a6585b06a1 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -112,7 +112,7 @@ public:
inline void unlock(void) { m_threadid = -1; }
//const linked_list_entry *list;
- node_step_list_t step_list;
+ node_step_list_t step_list;
/* list of source nodes */
dynamic_array_t<input_buffer> source_list; /* discrete_source_node */
@@ -135,7 +135,7 @@ protected:
void check(discrete_task *dest_task);
void prepare_for_queue(int samples);
- dynamic_array_t<output_buffer> m_buffers;
+ dynamic_array_t<output_buffer> m_buffers;
discrete_device & m_device;
private:
@@ -303,7 +303,7 @@ void discrete_task::check(discrete_task *dest_task)
output_buffer *pbuf = NULL;
for (i = 0; i < m_buffers.count(); i++)
-// if (m_buffers[i].node->block_node() == inputnode_num)
+// if (m_buffers[i].node->block_node() == inputnode_num)
if (m_buffers[i].node_num == inputnode_num)
{
found = i;
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index 885f11c5d1f..d8682640e57 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -3503,7 +3503,7 @@
#define DISCRETE_STOP(_class) void DISCRETE_CLASS_FUNC(_class, stop)(void)
#define DISCRETE_DECLARE_INFO(_name) const _name *info = (const _name *)this->custom_data();
-//#define DISCRETE_INPUT(_num) (*(this->m_input[_num]))
+//#define DISCRETE_INPUT(_num) (*(this->m_input[_num]))
#define DISCRETE_INPUT(_num) (input(_num))
/*************************************
@@ -3817,7 +3817,7 @@ public:
m_arr[i-1] = m_arr[i];
m_count--;
}
- inline void clear(void) { m_count = 0; }
+ inline void clear(void) { m_count = 0; }
inline int count(void) const { return m_count; }
inline T *begin_ptr(void) const { return m_arr; }
inline T *end_ptr(void) const { return m_arr + (m_count - 1); }
@@ -4383,7 +4383,7 @@ protected:
double m_neg_sample_time;
/* list of all nodes */
- node_list_t m_node_list; /* node_description * */
+ node_list_t m_node_list; /* node_description * */
private:
void discrete_build_list(const discrete_block *intf, sound_block_list_t &block_list);
@@ -4427,7 +4427,7 @@ public:
// ======================> discrete_sound_device
-class discrete_sound_device : public discrete_device,
+class discrete_sound_device : public discrete_device,
public device_sound_interface
{
friend class discrete_sound_device_config;
@@ -4462,7 +4462,7 @@ private:
/* the input streams */
istream_node_list_t m_input_stream_list;
/* output node tracking */
- node_output_list_t m_output_list;
+ node_output_list_t m_output_list;
};
// device type definition
diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c
index 5377a236408..08a11f9cf31 100644
--- a/src/emu/sound/okim6295.c
+++ b/src/emu/sound/okim6295.c
@@ -324,7 +324,7 @@ void okim6295_device::write_command(UINT8 command)
// the manual explicitly says that it's not possible to start multiple voices at the same time
int voicemask = command >> 4;
//if (voicemask != 0 && voicemask != 1 && voicemask != 2 && voicemask != 4 && voicemask != 8)
- // popmessage("OKI6295 start %x contact MAMEDEV", voicemask);
+ // popmessage("OKI6295 start %x contact MAMEDEV", voicemask);
// update the stream
stream_update(m_stream);
diff --git a/src/emu/sound/segapcm.c b/src/emu/sound/segapcm.c
index fd2398494ac..377f151eae7 100644
--- a/src/emu/sound/segapcm.c
+++ b/src/emu/sound/segapcm.c
@@ -35,26 +35,26 @@ static STREAM_UPDATE( SEGAPCM_update )
memset(outputs[0], 0, samples*sizeof(*outputs[0]));
memset(outputs[1], 0, samples*sizeof(*outputs[1]));
- // reg function
+ // reg function
// ------------------------------------------------
- // 0x00 ?
- // 0x01 ?
- // 0x02 volume left
- // 0x03 volume right
- // 0x04 loop address (08-15)
- // 0x05 loop address (16-23)
- // 0x06 end address
- // 0x07 address delta
- // 0x80 ?
- // 0x81 ?
- // 0x82 ?
- // 0x83 ?
- // 0x84 current address (08-15), 00-07 is internal?
- // 0x85 current address (16-23)
- // 0x86 bit 0: channel disable?
- // bit 1: loop disable
- // other bits: bank
- // 0x87 ?
+ // 0x00 ?
+ // 0x01 ?
+ // 0x02 volume left
+ // 0x03 volume right
+ // 0x04 loop address (08-15)
+ // 0x05 loop address (16-23)
+ // 0x06 end address
+ // 0x07 address delta
+ // 0x80 ?
+ // 0x81 ?
+ // 0x82 ?
+ // 0x83 ?
+ // 0x84 current address (08-15), 00-07 is internal?
+ // 0x85 current address (16-23)
+ // 0x86 bit 0: channel disable?
+ // bit 1: loop disable
+ // other bits: bank
+ // 0x87 ?
/* loop over channels */
for (ch = 0; ch < 16; ch++)