From 3031fb0b877495e98233b2728cbb4a2bf5dbbe11 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Thu, 26 Jun 2014 23:41:33 +0400 Subject: ao: fixed BSD linking issues --- plugins/ao/eng_dsf/aica.c | 4 ++-- plugins/ao/eng_dsf/aicalfo.c | 4 ++-- plugins/ao/eng_psf/peops2/adsr.h | 4 ++-- plugins/ao/eng_psf/peops2/adsr2.c | 4 ++-- plugins/ao/eng_psf/peops2/reverb2.c | 14 +++++++------- plugins/ao/eng_psf/peops2/spu2.c | 6 +++--- plugins/ao/eng_psf/psx.c | 22 +++++++++++----------- plugins/ao/eng_ssf/scsplfo.c | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-) (limited to 'plugins') diff --git a/plugins/ao/eng_dsf/aica.c b/plugins/ao/eng_dsf/aica.c index f504d647..02831699 100644 --- a/plugins/ao/eng_dsf/aica.c +++ b/plugins/ao/eng_dsf/aica.c @@ -402,7 +402,7 @@ void InitADPCM(int *PrevSignal, int *PrevQuant) *PrevQuant=0x7f; } -INLINE signed short DecodeADPCM(int *PrevSignal, unsigned char Delta, int *PrevQuant) +static INLINE signed short DecodeADPCM(int *PrevSignal, unsigned char Delta, int *PrevQuant) { int x = *PrevQuant * quant_mul [Delta & 15]; x = *PrevSignal + ((int)(x + ((UINT32)x >> 29)) >> 3); @@ -957,7 +957,7 @@ void AICA_TimersAddTicks(struct _AICA *AICA, int ticks) } } -INLINE INT32 AICA_UpdateSlot(struct _AICA *AICA, struct _SLOT *slot) +static INLINE INT32 AICA_UpdateSlot(struct _AICA *AICA, struct _SLOT *slot) { INT32 sample, fpart; int cur_sample; //current sample diff --git a/plugins/ao/eng_dsf/aicalfo.c b/plugins/ao/eng_dsf/aicalfo.c index 9af2ae54..cc1ea1cc 100644 --- a/plugins/ao/eng_dsf/aicalfo.c +++ b/plugins/ao/eng_dsf/aicalfo.c @@ -103,7 +103,7 @@ void AICALFO_Init(void) } } -signed int INLINE AICAPLFO_Step(struct _LFO *LFO) +static signed int INLINE AICAPLFO_Step(struct _LFO *LFO) { int p; @@ -116,7 +116,7 @@ signed int INLINE AICAPLFO_Step(struct _LFO *LFO) return p<<(SHIFT-LFO_SHIFT); } -signed int INLINE AICAALFO_Step(struct _LFO *LFO) +static signed int INLINE AICAALFO_Step(struct _LFO *LFO) { int p; LFO->phase+=LFO->phase_step; diff --git a/plugins/ao/eng_psf/peops2/adsr.h b/plugins/ao/eng_psf/peops2/adsr.h index 777a0d84..fc031ef0 100644 --- a/plugins/ao/eng_psf/peops2/adsr.h +++ b/plugins/ao/eng_psf/peops2/adsr.h @@ -24,5 +24,5 @@ // //*************************************************************************// -INLINE void StartADSR(int ch); -INLINE int MixADSR(int ch); +static INLINE void StartADSR(int ch); +static INLINE int MixADSR(int ch); diff --git a/plugins/ao/eng_psf/peops2/adsr2.c b/plugins/ao/eng_psf/peops2/adsr2.c index 470069c6..79af6c03 100644 --- a/plugins/ao/eng_psf/peops2/adsr2.c +++ b/plugins/ao/eng_psf/peops2/adsr2.c @@ -66,7 +66,7 @@ void InitADSR(void) // INIT ADSR //////////////////////////////////////////////////////////////////////// -INLINE void StartADSR(spu2_state_t *spu, int ch) // MIX ADSR +static INLINE void StartADSR(spu2_state_t *spu, int ch) // MIX ADSR { spu->s_chan[ch].ADSRX.lVolume=1; // and init some adsr vars spu->s_chan[ch].ADSRX.State=0; @@ -75,7 +75,7 @@ INLINE void StartADSR(spu2_state_t *spu, int ch) // MIX //////////////////////////////////////////////////////////////////////// -INLINE int MixADSR(spu2_state_t *spu, int ch) // MIX ADSR +static INLINE int MixADSR(spu2_state_t *spu, int ch) // MIX ADSR { if(spu->s_chan[ch].bStop) // should be stopped: { // do release diff --git a/plugins/ao/eng_psf/peops2/reverb2.c b/plugins/ao/eng_psf/peops2/reverb2.c index e939be87..f8a80661 100644 --- a/plugins/ao/eng_psf/peops2/reverb2.c +++ b/plugins/ao/eng_psf/peops2/reverb2.c @@ -51,7 +51,7 @@ // START REVERB //////////////////////////////////////////////////////////////////////// -INLINE void StartREVERB(spu2_state_t *spu, int ch) +static INLINE void StartREVERB(spu2_state_t *spu, int ch) { int core=ch/24; @@ -66,7 +66,7 @@ INLINE void StartREVERB(spu2_state_t *spu, int ch) // HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf //////////////////////////////////////////////////////////////////////// -INLINE void InitREVERB(spu2_state_t *spu) +static INLINE void InitREVERB(spu2_state_t *spu) { if(spu->iUseReverb==1) { @@ -79,7 +79,7 @@ INLINE void InitREVERB(spu2_state_t *spu) // STORE REVERB //////////////////////////////////////////////////////////////////////// -INLINE void StoreREVERB(spu2_state_t *spu, int ch,int ns) +static INLINE void StoreREVERB(spu2_state_t *spu, int ch,int ns) { int core=ch/24; @@ -99,7 +99,7 @@ INLINE void StoreREVERB(spu2_state_t *spu, int ch,int ns) //////////////////////////////////////////////////////////////////////// -INLINE int g_buffer(spu2_state_t *spu, int iOff,int core) // get_buffer content helper: takes care about wraps +static INLINE int g_buffer(spu2_state_t *spu, int iOff,int core) // get_buffer content helper: takes care about wraps { short * p=(short *)spu->spuMem; iOff=(iOff)+spu->rvb[core].CurrAddr; @@ -110,7 +110,7 @@ INLINE int g_buffer(spu2_state_t *spu, int iOff,int core) // g //////////////////////////////////////////////////////////////////////// -INLINE void s_buffer(spu2_state_t *spu, int iOff,int iVal,int core) // set_buffer content helper: takes care about wraps and clipping +static INLINE void s_buffer(spu2_state_t *spu, int iOff,int iVal,int core) // set_buffer content helper: takes care about wraps and clipping { short * p=(short *)spu->spuMem; iOff=(iOff)+spu->rvb[core].CurrAddr; @@ -122,7 +122,7 @@ INLINE void s_buffer(spu2_state_t *spu, int iOff,int iVal,int core) // se //////////////////////////////////////////////////////////////////////// -INLINE void s_buffer1(spu2_state_t *spu, int iOff,int iVal,int core) // set_buffer (+1 sample) content helper: takes care about wraps and clipping +static INLINE void s_buffer1(spu2_state_t *spu, int iOff,int iVal,int core) // set_buffer (+1 sample) content helper: takes care about wraps and clipping { short * p=(short *)spu->spuMem; iOff=(iOff)+spu->rvb[core].CurrAddr+1; @@ -221,7 +221,7 @@ static INLINE int MixREVERBLeft(spu2_state_t *spu, int ns,int core) //////////////////////////////////////////////////////////////////////// -INLINE int MixREVERBRight(spu2_state_t *spu, int core) +static INLINE int MixREVERBRight(spu2_state_t *spu, int core) { if(spu->iUseReverb==1) // Neill's reverb: { diff --git a/plugins/ao/eng_psf/peops2/spu2.c b/plugins/ao/eng_psf/peops2/spu2.c index 44546170..32f56ff0 100644 --- a/plugins/ao/eng_psf/peops2/spu2.c +++ b/plugins/ao/eng_psf/peops2/spu2.c @@ -170,7 +170,7 @@ const int f[5][2] = { { 0, 0 }, // -INLINE void InterpolateUp(spu2_state_t *spu, int ch) +static INLINE void InterpolateUp(spu2_state_t *spu, int ch) { if(spu->s_chan[ch].SB[32]==1) // flag == 1? calc step and set flag... and don't change the value in this pass { @@ -218,7 +218,7 @@ INLINE void InterpolateUp(spu2_state_t *spu, int ch) // even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm // -INLINE void InterpolateDown(spu2_state_t *spu, int ch) +static INLINE void InterpolateDown(spu2_state_t *spu, int ch) { if(spu->s_chan[ch].sinc>=0x20000L) // we would skip at least one val? { @@ -244,7 +244,7 @@ INLINE void InterpolateDown(spu2_state_t *spu, int ch) // START SOUND... called by main thread to setup a new sound on a channel //////////////////////////////////////////////////////////////////////// -INLINE void StartSound(spu2_state_t *spu, int ch) +static INLINE void StartSound(spu2_state_t *spu, int ch) { spu->dwNewChannel2[ch/24]&=~(1<<(ch%24)); // clear new channel bit spu->dwEndChannel2[ch/24]&=~(1<<(ch%24)); // clear end channel bit diff --git a/plugins/ao/eng_psf/psx.c b/plugins/ao/eng_psf/psx.c index 8f646d05..1a0adda1 100644 --- a/plugins/ao/eng_psf/psx.c +++ b/plugins/ao/eng_psf/psx.c @@ -204,7 +204,7 @@ void GTELOG(const char *a,...) logerror( "%08x: GTE: %08x %s\n", cpu->pc, INS_COFUN( cpu->op ), s_text ); } #else -INLINE void GTELOG(const char *a, ...) {} +static INLINE void GTELOG(const char *a, ...) {} #endif static UINT32 getcp2dr( mips_cpu_context *cpu, int n_reg ); @@ -223,7 +223,7 @@ void mips_stop( void ) #endif } -INLINE void mips_set_cp0r(mips_cpu_context *cpu, int reg, UINT32 value ) +static INLINE void mips_set_cp0r(mips_cpu_context *cpu, int reg, UINT32 value ) { cpu->cp0r[ reg ] = value; if( reg == CP0_SR || reg == CP0_CAUSE ) @@ -240,7 +240,7 @@ INLINE void mips_set_cp0r(mips_cpu_context *cpu, int reg, UINT32 value ) } } -INLINE void mips_commit_delayed_load(mips_cpu_context *cpu) +static INLINE void mips_commit_delayed_load(mips_cpu_context *cpu) { if( cpu->delayr != 0 ) { @@ -250,7 +250,7 @@ INLINE void mips_commit_delayed_load(mips_cpu_context *cpu) } } -INLINE void mips_delayed_branch(mips_cpu_context *cpu, UINT32 n_adr ) +static INLINE void mips_delayed_branch(mips_cpu_context *cpu, UINT32 n_adr ) { if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 ) { @@ -266,7 +266,7 @@ INLINE void mips_delayed_branch(mips_cpu_context *cpu, UINT32 n_adr ) } } -INLINE void mips_set_pc(mips_cpu_context *cpu, unsigned val ) +static INLINE void mips_set_pc(mips_cpu_context *cpu, unsigned val ) { cpu->pc = val; change_pc( val ); @@ -274,7 +274,7 @@ INLINE void mips_set_pc(mips_cpu_context *cpu, unsigned val ) cpu->delayv = 0; } -INLINE void mips_advance_pc(mips_cpu_context *cpu) +static INLINE void mips_advance_pc(mips_cpu_context *cpu) { if( cpu->delayr == REGPC ) { @@ -287,7 +287,7 @@ INLINE void mips_advance_pc(mips_cpu_context *cpu) } } -INLINE void mips_load(mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v ) +static INLINE void mips_load(mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v ) { mips_advance_pc(cpu); if( n_r != 0 ) @@ -296,7 +296,7 @@ INLINE void mips_load(mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v ) } } -INLINE void mips_delayed_load( mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v ) +static INLINE void mips_delayed_load( mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v ) { if( cpu->delayr == REGPC ) { @@ -1905,7 +1905,7 @@ static void setcp2cr(mips_cpu_context *cpu, int n_reg, UINT32 n_value ) cpu->cp2cr[ n_reg ].d = n_value; } -INLINE INT32 LIM( mips_cpu_context *cpu, INT32 n_value, INT32 n_max, INT32 n_min, UINT32 n_flag ) +static INLINE INT32 LIM( mips_cpu_context *cpu, INT32 n_value, INT32 n_max, INT32 n_min, UINT32 n_flag ) { if( n_value > n_max ) { @@ -1920,7 +1920,7 @@ INLINE INT32 LIM( mips_cpu_context *cpu, INT32 n_value, INT32 n_max, INT32 n_min return n_value; } -INLINE INT64 BOUNDS( mips_cpu_context *cpu, INT64 n_value, INT64 n_max, int n_maxflag, INT64 n_min, int n_minflag ) +static INLINE INT64 BOUNDS( mips_cpu_context *cpu, INT64 n_value, INT64 n_max, int n_maxflag, INT64 n_min, int n_minflag ) { if( n_value > n_max ) { @@ -1944,7 +1944,7 @@ INLINE INT64 BOUNDS( mips_cpu_context *cpu, INT64 n_value, INT64 n_max, int n_ma #define Lm_C3( a ) LIM( cpu, ( a ), 0x00ff, 0x0000, ( 1 << 19 ) ) #define Lm_D( a ) LIM( cpu, ( a ), 0xffff, 0x0000, ( 1 << 31 ) | ( 1 << 18 ) ) -INLINE UINT32 Lm_E( mips_cpu_context *cpu, UINT32 n_z ) +static INLINE UINT32 Lm_E( mips_cpu_context *cpu, UINT32 n_z ) { if( n_z <= H / 2 ) { diff --git a/plugins/ao/eng_ssf/scsplfo.c b/plugins/ao/eng_ssf/scsplfo.c index c25e3c8d..0a8281c1 100644 --- a/plugins/ao/eng_ssf/scsplfo.c +++ b/plugins/ao/eng_ssf/scsplfo.c @@ -104,7 +104,7 @@ void LFO_Init(void) } } -signed int INLINE PLFO_Step(struct _LFO *LFO) +static signed int INLINE PLFO_Step(struct _LFO *LFO) { int p; LFO->phase+=LFO->phase_step; @@ -116,7 +116,7 @@ signed int INLINE PLFO_Step(struct _LFO *LFO) return p<<(SHIFT-LFO_SHIFT); } -signed int INLINE ALFO_Step(struct _LFO *LFO) +static signed int INLINE ALFO_Step(struct _LFO *LFO) { int p; LFO->phase+=LFO->phase_step; -- cgit v1.2.3