notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update jni/Android.mk
[picodrive.git]
/
pico
/
sound
/
ym2612.c
diff --git
a/pico/sound/ym2612.c
b/pico/sound/ym2612.c
index
b06007b
..
692f34e
100644
(file)
--- a/
pico/sound/ym2612.c
+++ b/
pico/sound/ym2612.c
@@
-557,7
+557,7
@@
static INLINE void set_timers( int v )
}
\r
\r
\r
}
\r
\r
\r
-INLINE void FM_KEYON(int c , int s )
\r
+
static
INLINE void FM_KEYON(int c , int s )
\r
{
\r
FM_SLOT *SLOT = &ym2612.CH[c].SLOT[s];
\r
if( !SLOT->key )
\r
{
\r
FM_SLOT *SLOT = &ym2612.CH[c].SLOT[s];
\r
if( !SLOT->key )
\r
@@
-569,7
+569,7
@@
INLINE void FM_KEYON(int c , int s )
}
\r
}
\r
\r
}
\r
}
\r
\r
-INLINE void FM_KEYOFF(int c , int s )
\r
+
static
INLINE void FM_KEYOFF(int c , int s )
\r
{
\r
FM_SLOT *SLOT = &ym2612.CH[c].SLOT[s];
\r
if( SLOT->key )
\r
{
\r
FM_SLOT *SLOT = &ym2612.CH[c].SLOT[s];
\r
if( SLOT->key )
\r
@@
-582,7
+582,7
@@
INLINE void FM_KEYOFF(int c , int s )
\r
\r
/* set detune & multiple */
\r
\r
\r
/* set detune & multiple */
\r
-INLINE void set_det_mul(FM_CH *CH, FM_SLOT *SLOT, int v)
\r
+
static
INLINE void set_det_mul(FM_CH *CH, FM_SLOT *SLOT, int v)
\r
{
\r
SLOT->mul = (v&0x0f)? (v&0x0f)*2 : 1;
\r
SLOT->DT = ym2612.OPN.ST.dt_tab[(v>>4)&7];
\r
{
\r
SLOT->mul = (v&0x0f)? (v&0x0f)*2 : 1;
\r
SLOT->DT = ym2612.OPN.ST.dt_tab[(v>>4)&7];
\r
@@
-668,7
+668,7
@@
static INLINE void set_sl_rr(FM_SLOT *SLOT, int v)
SLOT->eg_pack_rr = eg_inc_pack[eg_sel_rr] | (eg_sh_rr<<24);
\r
}
\r
\r
SLOT->eg_pack_rr = eg_inc_pack[eg_sel_rr] | (eg_sh_rr<<24);
\r
}
\r
\r
-INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
\r
+
static
INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
\r
{
\r
int ret, sin = (phase>>16) + (pm>>1);
\r
int neg = sin & 0x200;
\r
{
\r
int ret, sin = (phase>>16) + (pm>>1);
\r
int neg = sin & 0x200;
\r
@@
-685,7
+685,7
@@
INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
return neg ? -ret : ret;
\r
}
\r
\r
return neg ? -ret : ret;
\r
}
\r
\r
-INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
\r
+
static
INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
\r
{
\r
int ret, sin = (phase+pm)>>16;
\r
int neg = sin & 0x200;
\r
{
\r
int ret, sin = (phase+pm)>>16;
\r
int neg = sin & 0x200;
\r
@@
-703,7
+703,7
@@
INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
\r
#if !defined(_ASM_YM2612_C) || defined(EXTERNAL_YM2612)
\r
/* advance LFO to next sample */
\r
\r
#if !defined(_ASM_YM2612_C) || defined(EXTERNAL_YM2612)
\r
/* advance LFO to next sample */
\r
-INLINE int advance_lfo(int lfo_ampm, UINT32 lfo_cnt_old, UINT32 lfo_cnt)
\r
+
static
INLINE int advance_lfo(int lfo_ampm, UINT32 lfo_cnt_old, UINT32 lfo_cnt)
\r
{
\r
UINT8 pos;
\r
UINT8 prev_pos;
\r
{
\r
UINT8 pos;
\r
UINT8 prev_pos;
\r