diff options
Diffstat (limited to 'src/emu/sound')
| -rw-r--r-- | src/emu/sound/c140.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/c352.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/discrete.c | 4 | ||||
| -rw-r--r-- | src/emu/sound/discrete.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/es5503.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/fm.c | 16 | ||||
| -rw-r--r-- | src/emu/sound/fm2612.c | 12 | ||||
| -rw-r--r-- | src/emu/sound/fmopl.c | 6 | ||||
| -rw-r--r-- | src/emu/sound/i5000.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/k005289.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/k007232.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/k051649.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/mos6560.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/n63701x.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/namco.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/nes_defs.h | 12 | ||||
| -rw-r--r-- | src/emu/sound/s14001a.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/sid6581.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/sid6581.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/sn76496.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/tms5220.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/upd7759.c | 6 | ||||
| -rw-r--r-- | src/emu/sound/ym2151.c | 4 | ||||
| -rw-r--r-- | src/emu/sound/ym2413.c | 6 | ||||
| -rw-r--r-- | src/emu/sound/ymf262.c | 6 | ||||
| -rw-r--r-- | src/emu/sound/ymf271.c | 6 | ||||
| -rw-r--r-- | src/emu/sound/ymf278b.c | 4 | ||||
| -rw-r--r-- | src/emu/sound/ymz770.h | 2 |
28 files changed, 58 insertions, 58 deletions
diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c index 4c50b1f6bee..a3fbbe2a03a 100644 --- a/src/emu/sound/c140.c +++ b/src/emu/sound/c140.c @@ -65,7 +65,7 @@ struct voice_registers UINT8 reserved[4]; }; -struct VOICE +struct VOICE { long ptoffset; long pos; diff --git a/src/emu/sound/c352.h b/src/emu/sound/c352.h index 3341884ae89..bc15db47241 100644 --- a/src/emu/sound/c352.h +++ b/src/emu/sound/c352.h @@ -63,7 +63,7 @@ private: C352_FLG_REVERSE = 0x0001, // play sample backwards }; - struct c352_ch_t + struct c352_ch_t { UINT8 vol_l; UINT8 vol_r; diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c index 4ff682c33ae..34668fb26aa 100644 --- a/src/emu/sound/discrete.c +++ b/src/emu/sound/discrete.c @@ -83,7 +83,7 @@ const device_type DISCRETE = &device_creator<discrete_sound_device>; * *************************************/ -struct output_buffer +struct output_buffer { double *node_buf; const double *source; @@ -91,7 +91,7 @@ struct output_buffer int node_num; }; -struct input_buffer +struct input_buffer { volatile const double *ptr; /* pointer into linked_outbuf.nodebuf */ output_buffer * linked_outbuf; /* what output are we connected to ? */ diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h index 46fe8c671a2..147194f03ee 100644 --- a/src/emu/sound/discrete.h +++ b/src/emu/sound/discrete.h @@ -4139,7 +4139,7 @@ enum { * *************************************/ -enum discrete_node_type +enum discrete_node_type { DSS_NULL, /* Nothing, nill, zippo, only to be used as terminating node */ DSS_NOP, /* just do nothing, placeholder for potential DISCRETE_REPLACE in parent block */ diff --git a/src/emu/sound/es5503.h b/src/emu/sound/es5503.h index 86595e6ffeb..1fa65378198 100644 --- a/src/emu/sound/es5503.h +++ b/src/emu/sound/es5503.h @@ -67,7 +67,7 @@ private: MODE_SWAP = 3 }; - struct ES5503Osc + struct ES5503Osc { UINT16 freq; UINT16 wtsize; diff --git a/src/emu/sound/fm.c b/src/emu/sound/fm.c index e273e937c1c..b3c292c1c22 100644 --- a/src/emu/sound/fm.c +++ b/src/emu/sound/fm.c @@ -519,7 +519,7 @@ static FILE *sample[1]; /* struct describing a single operator (SLOT) */ -struct FM_SLOT +struct FM_SLOT { INT32 *DT; /* detune :dt_tab[DT] */ UINT8 KSR; /* key scale rate :3-KSR */ @@ -560,7 +560,7 @@ struct FM_SLOT }; -struct FM_CH +struct FM_CH { FM_SLOT SLOT[4]; /* four SLOTs (operators) */ @@ -585,7 +585,7 @@ struct FM_CH }; -struct FM_ST +struct FM_ST { device_t *device; void * param; /* this chip parameter */ @@ -622,7 +622,7 @@ struct FM_ST /***********************************************************/ /* OPN 3slot struct */ -struct FM_3SLOT +struct FM_3SLOT { UINT32 fc[3]; /* fnum3,blk3: calculated */ UINT8 fn_h; /* freq3 latch */ @@ -631,7 +631,7 @@ struct FM_3SLOT }; /* OPN/A/B common state */ -struct FM_OPN +struct FM_OPN { UINT8 type; /* chip type */ FM_ST ST; /* general state */ @@ -2089,7 +2089,7 @@ static void OPNPrescaler_w(FM_OPN *OPN , int addr, int pre_divider) /*****************************************************************************/ /* here's the virtual YM2203(OPN) */ -struct YM2203 +struct YM2203 { UINT8 REGS[256]; /* registers */ FM_OPN OPN; /* OPN state */ @@ -2385,7 +2385,7 @@ int ym2203_timer_over(void *chip,int c) #if (BUILD_YM2608||BUILD_YM2610||BUILD_YM2610B) /* ADPCM type A channel struct */ -struct ADPCM_CH +struct ADPCM_CH { UINT8 flag; /* port state */ UINT8 flagMask; /* arrived flag mask */ @@ -2405,7 +2405,7 @@ struct ADPCM_CH }; /* here's the virtual YM2610 */ -struct YM2610 +struct YM2610 { UINT8 REGS[512]; /* registers */ FM_OPN OPN; /* OPN state */ diff --git a/src/emu/sound/fm2612.c b/src/emu/sound/fm2612.c index a3e6fa9b4c1..bc00afee192 100644 --- a/src/emu/sound/fm2612.c +++ b/src/emu/sound/fm2612.c @@ -531,7 +531,7 @@ static FILE *sample[1]; /* struct describing a single operator (SLOT) */ -struct FM_SLOT +struct FM_SLOT { INT32 *DT; /* detune :dt_tab[DT] */ UINT8 KSR; /* key scale rate :3-KSR */ @@ -572,7 +572,7 @@ struct FM_SLOT }; -struct FM_CH +struct FM_CH { FM_SLOT SLOT[4]; /* four SLOTs (operators) */ @@ -597,7 +597,7 @@ struct FM_CH }; -struct FM_ST +struct FM_ST { device_t *device; void * param; /* this chip parameter */ @@ -634,7 +634,7 @@ struct FM_ST /***********************************************************/ /* OPN 3slot struct */ -struct FM_3SLOT +struct FM_3SLOT { UINT32 fc[3]; /* fnum3,blk3: calculated */ UINT8 fn_h; /* freq3 latch */ @@ -644,7 +644,7 @@ struct FM_3SLOT }; /* OPN/A/B common state */ -struct FM_OPN +struct FM_OPN { UINT8 type; /* chip type */ FM_ST ST; /* general state */ @@ -678,7 +678,7 @@ struct FM_OPN }; /* here's the virtual YM2612 */ -struct YM2612 +struct YM2612 { UINT8 REGS[512]; /* registers */ FM_OPN OPN; /* OPN state */ diff --git a/src/emu/sound/fmopl.c b/src/emu/sound/fmopl.c index 59d4bc644ad..6caf88875e0 100644 --- a/src/emu/sound/fmopl.c +++ b/src/emu/sound/fmopl.c @@ -198,7 +198,7 @@ static FILE * cymfile = NULL; -struct OPL_SLOT +struct OPL_SLOT { UINT32 ar; /* attack rate: AR<<2 */ UINT32 dr; /* decay rate: DR<<2 */ @@ -239,7 +239,7 @@ struct OPL_SLOT UINT16 wavetable; }; -struct OPL_CH +struct OPL_CH { OPL_SLOT SLOT[2]; /* phase generator state */ @@ -250,7 +250,7 @@ struct OPL_CH }; /* OPL state */ -struct FM_OPL +struct FM_OPL { /* FM channel slots */ OPL_CH P_CH[9]; /* OPL/OPL2 chips have 9 channels*/ diff --git a/src/emu/sound/i5000.h b/src/emu/sound/i5000.h index 358edd1749a..52103025bc6 100644 --- a/src/emu/sound/i5000.h +++ b/src/emu/sound/i5000.h @@ -47,7 +47,7 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); private: - struct channel_t + struct channel_t { bool is_playing; oki_adpcm_state m_adpcm; diff --git a/src/emu/sound/k005289.c b/src/emu/sound/k005289.c index f8a52327fac..94025526d6a 100644 --- a/src/emu/sound/k005289.c +++ b/src/emu/sound/k005289.c @@ -31,7 +31,7 @@ #define FREQBASEBITS 16 /* this structure defines the parameters for a channel */ -struct k005289_sound_channel +struct k005289_sound_channel { int frequency; int counter; diff --git a/src/emu/sound/k007232.c b/src/emu/sound/k007232.c index 15aa230ceef..08c2653d55d 100644 --- a/src/emu/sound/k007232.c +++ b/src/emu/sound/k007232.c @@ -30,7 +30,7 @@ added external port callback, and functions to set the volume of the channels #define KDAC_A_PCM_MAX (2) /* Channels per chip */ -struct KDAC_A_PCM +struct KDAC_A_PCM { UINT8 vol[KDAC_A_PCM_MAX][2]; /* volume for the left and right channel */ UINT32 addr[KDAC_A_PCM_MAX]; diff --git a/src/emu/sound/k051649.c b/src/emu/sound/k051649.c index 4c072b53b9b..338b5009058 100644 --- a/src/emu/sound/k051649.c +++ b/src/emu/sound/k051649.c @@ -30,7 +30,7 @@ /* this structure defines the parameters for a channel */ -struct k051649_sound_channel +struct k051649_sound_channel { unsigned long counter; int frequency; diff --git a/src/emu/sound/mos6560.c b/src/emu/sound/mos6560.c index 422b69d1687..141930fc98b 100644 --- a/src/emu/sound/mos6560.c +++ b/src/emu/sound/mos6560.c @@ -156,7 +156,7 @@ static const rgb_t PALETTE[] = inline UINT8 mos6560_device::read_videoram(offs_t offset) { m_last_data = space(AS_0)->read_byte(offset & 0x3fff); - + return m_last_data; } diff --git a/src/emu/sound/n63701x.c b/src/emu/sound/n63701x.c index 65780163b71..3c60e7a284c 100644 --- a/src/emu/sound/n63701x.c +++ b/src/emu/sound/n63701x.c @@ -17,7 +17,7 @@ silence compression: '00 nn' must be replaced by nn+1 times '80'. #include "n63701x.h" -struct voice +struct voice { int select; int playing; diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c index 0bc916a899f..ec595ad0271 100644 --- a/src/emu/sound/namco.c +++ b/src/emu/sound/namco.c @@ -36,7 +36,7 @@ /* this structure defines the parameters for a channel */ -struct sound_channel +struct sound_channel { UINT32 frequency; UINT32 counter; diff --git a/src/emu/sound/nes_defs.h b/src/emu/sound/nes_defs.h index 280c96d7aa2..d68151033a0 100644 --- a/src/emu/sound/nes_defs.h +++ b/src/emu/sound/nes_defs.h @@ -48,7 +48,7 @@ typedef UINT8 boolean; #define QUEUE_SIZE 0x2000 #define QUEUE_MAX (QUEUE_SIZE-1) -struct queue_t +struct queue_t { int pos; unsigned char reg,val; @@ -84,7 +84,7 @@ struct queue_t /* CHANNEL TYPE DEFINITIONS */ /* Square Wave */ -struct square_t +struct square_t { uint8 regs[4]; int vbl_length; @@ -99,7 +99,7 @@ struct square_t }; /* Triangle Wave */ -struct triangle_t +struct triangle_t { uint8 regs[4]; /* regs[1] unused */ int linear_length; @@ -113,7 +113,7 @@ struct triangle_t }; /* Noise Wave */ -struct noise_t +struct noise_t { uint8 regs[4]; /* regs[1] unused */ int cur_pos; @@ -126,7 +126,7 @@ struct noise_t }; /* DPCM Wave */ -struct dpcm_t +struct dpcm_t { uint8 regs[4]; uint32 address; @@ -142,7 +142,7 @@ struct dpcm_t }; /* APU type */ -struct apu_t +struct apu_t { /* Sound channels */ square_t squ[2]; diff --git a/src/emu/sound/s14001a.c b/src/emu/sound/s14001a.c index 68a78ff2fbd..caa29f74195 100644 --- a/src/emu/sound/s14001a.c +++ b/src/emu/sound/s14001a.c @@ -237,7 +237,7 @@ and off as it normally does during speech). Once START has gone low-high-low, th #include "emu.h" #include "s14001a.h" -struct S14001AChip +struct S14001AChip { sound_stream * stream; diff --git a/src/emu/sound/sid6581.c b/src/emu/sound/sid6581.c index 3329f574d6f..8434f8ba7d5 100644 --- a/src/emu/sound/sid6581.c +++ b/src/emu/sound/sid6581.c @@ -34,7 +34,7 @@ static void sid_start(device_t *device, SIDTYPE sidtype) SID6581_t *sid = get_sid(device); const sid6581_interface *iface = (const sid6581_interface*) device->static_config(); assert(iface); - + // resolve callbacks sid->in_potx_func.resolve(iface->in_potx_cb, *device); sid->in_poty_func.resolve(iface->in_poty_cb, *device); diff --git a/src/emu/sound/sid6581.h b/src/emu/sound/sid6581.h index 53f37e713c0..752bbb2937b 100644 --- a/src/emu/sound/sid6581.h +++ b/src/emu/sound/sid6581.h @@ -14,7 +14,7 @@ #include "devlegcy.h" -enum SIDTYPE +enum SIDTYPE { MOS6581, MOS8580 diff --git a/src/emu/sound/sn76496.h b/src/emu/sound/sn76496.h index 03d7e0c97a1..1ce40acaf8b 100644 --- a/src/emu/sound/sn76496.h +++ b/src/emu/sound/sn76496.h @@ -176,7 +176,7 @@ extern const device_type NCR7496_NEW; extern const device_type GAMEGEAR_NEW; extern const device_type SEGAPSG_NEW; -struct sn76496_config +struct sn76496_config { devcb_write_line ready; }; diff --git a/src/emu/sound/tms5220.h b/src/emu/sound/tms5220.h index e570d4d8968..c3c102f0d3a 100644 --- a/src/emu/sound/tms5220.h +++ b/src/emu/sound/tms5220.h @@ -121,7 +121,7 @@ extern const device_type TMC0285N; extern const device_type TMS5200N; -struct tms52xx_config +struct tms52xx_config { devcb_write_line irq_func; // IRQ callback function, active low, i.e. state=0 (TODO: change to ASSERT/CLEAR) devcb_write_line readyq_func; // Ready callback function, active low, i.e. state=0 diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c index db6eea99d2b..23a43ab722f 100644 --- a/src/emu/sound/upd7759.c +++ b/src/emu/sound/upd7759.c @@ -107,7 +107,7 @@ The other chip models don't support slave mode, and have an internal ROM. Other than that, they are thought to be nearly identical to uPD7759. - + 55C 18-pin DIP 96 Kbit ROM 55G 24-pin SOP 96 Kbit ROM 56C 18-pin DIP 256 Kbit ROM @@ -174,7 +174,7 @@ struct upd7759_state /* chip configuration */ UINT8 sample_offset_shift; /* header sample address shift (access data > 0xffff) */ - + /* internal clock to output sample rate mapping */ UINT32 pos; /* current output sample position */ UINT32 step; /* step value per output sample */ @@ -670,7 +670,7 @@ static DEVICE_START( upd7759 ) /* chip configuration */ chip->sample_offset_shift = (device->type() == UPD7759) ? 1 : 0; - + /* allocate a stream channel */ chip->channel = device->machine().sound().stream_alloc(*device, 0, 1, device->clock()/4, chip, upd7759_update); diff --git a/src/emu/sound/ym2151.c b/src/emu/sound/ym2151.c index 52dda68c749..fa175e7d8c4 100644 --- a/src/emu/sound/ym2151.c +++ b/src/emu/sound/ym2151.c @@ -23,7 +23,7 @@ static FILE * cymfile = NULL; /* struct describing a single operator */ -struct YM2151Operator +struct YM2151Operator { UINT32 phase; /* accumulated operator phase */ UINT32 freq; /* operator frequency count */ @@ -76,7 +76,7 @@ struct YM2151Operator }; -struct YM2151 +struct YM2151 { signed int chanout[8]; signed int m2,c1,c2; /* Phase Modulation input for operators 2,3,4 */ diff --git a/src/emu/sound/ym2413.c b/src/emu/sound/ym2413.c index c9966ad5d7f..ec71681fd3d 100644 --- a/src/emu/sound/ym2413.c +++ b/src/emu/sound/ym2413.c @@ -164,7 +164,7 @@ static FILE * cymfile = NULL; -struct OPLL_SLOT +struct OPLL_SLOT { UINT32 ar; /* attack rate: AR<<2 */ UINT32 dr; /* decay rate: DR<<2 */ @@ -209,7 +209,7 @@ struct OPLL_SLOT unsigned int wavetable; }; -struct OPLL_CH +struct OPLL_CH { OPLL_SLOT SLOT[2]; /* phase generator state */ @@ -221,7 +221,7 @@ struct OPLL_CH }; /* chip state */ -struct YM2413 +struct YM2413 { OPLL_CH P_CH[9]; /* OPLL chips have 9 channels*/ UINT8 instvol_r[9]; /* instrument/volume (or volume/volume in percussive mode)*/ diff --git a/src/emu/sound/ymf262.c b/src/emu/sound/ymf262.c index c24fd4280bf..1b5e4f3762e 100644 --- a/src/emu/sound/ymf262.c +++ b/src/emu/sound/ymf262.c @@ -141,7 +141,7 @@ static FILE * cymfile = NULL; #define OPL3_TYPE_YMF262 (0) /* 36 operators, 8 waveforms */ -struct OPL3_SLOT +struct OPL3_SLOT { UINT32 ar; /* attack rate: AR<<2 */ UINT32 dr; /* decay rate: DR<<2 */ @@ -192,7 +192,7 @@ unsigned char reserved[128-100];//speedup: pump up the struct size to power of 2 }; -struct OPL3_CH +struct OPL3_CH { OPL3_SLOT SLOT[2]; @@ -218,7 +218,7 @@ unsigned char reserved[512-272];//speedup:pump up the struct size to power of 2 }; /* OPL3 state */ -struct OPL3 +struct OPL3 { OPL3_CH P_CH[18]; /* OPL3 chips have 18 channels */ diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c index a1c8ededf21..35a278ac1f5 100644 --- a/src/emu/sound/ymf271.c +++ b/src/emu/sound/ymf271.c @@ -33,7 +33,7 @@ //#define log2(n) (log((float) n)/log((float) 2)) -struct YMF271Slot +struct YMF271Slot { INT8 extout; UINT8 lfoFreq; @@ -82,12 +82,12 @@ struct YMF271Slot double lfo_phasemod; }; -struct YMF271Group +struct YMF271Group { INT8 sync, pfm; }; -struct YMF271Chip +struct YMF271Chip { YMF271Slot slots[48]; YMF271Group groups[12]; diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c index df12602dafe..6ea6dbde17e 100644 --- a/src/emu/sound/ymf278b.c +++ b/src/emu/sound/ymf278b.c @@ -73,7 +73,7 @@ struct YMF278BChip; -struct YMF278BSlot +struct YMF278BSlot { INT16 wave; /* wavetable number */ INT16 F_NUMBER; /* frequency */ @@ -115,7 +115,7 @@ struct YMF278BSlot YMF278BChip *chip; /* pointer back to parent chip */ }; -struct YMF278BChip +struct YMF278BChip { UINT8 pcmregs[256]; YMF278BSlot slots[24]; diff --git a/src/emu/sound/ymz770.h b/src/emu/sound/ymz770.h index 320d89b47c0..ea0da561a9b 100644 --- a/src/emu/sound/ymz770.h +++ b/src/emu/sound/ymz770.h @@ -34,7 +34,7 @@ class amm; class ymz770_device : public device_t, public device_sound_interface { - struct ymz_channel + struct ymz_channel { UINT8 phrase; UINT8 pan; |
