From 72620542c0b52d0504943297a9c26a12e2cd249b Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Thu, 8 May 2014 14:01:27 -0400 Subject: [PATCH] OpulenZ/opl2 build fixes (Apple) - Cleaned up many non-bracketed sections for stricter compilers. - Remove custom `INLINE` keyword when building on clang. - Renable opl2 via plugins\CMakeLists.txts https://cloud.githubusercontent.com/assets/6345473/2919394/c474d668-d6da-11e3-82db-778a7ce6014d.png --- plugins/CMakeLists.txt | 4 +- plugins/opl2/fmopl.c | 1080 +++++++++++++++++++++------------------- 2 files changed, 580 insertions(+), 504 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 1835f813f..075c94ff3 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -12,9 +12,7 @@ ADD_SUBDIRECTORY(LadspaEffect) ADD_SUBDIRECTORY(lb302) #ADD_SUBDIRECTORY(lb303) ADD_SUBDIRECTORY(midi_import) -IF(NOT LMMS_BUILD_APPLE) - ADD_SUBDIRECTORY(opl2) -ENDIF() +ADD_SUBDIRECTORY(opl2) ADD_SUBDIRECTORY(organic) ADD_SUBDIRECTORY(papu) ADD_SUBDIRECTORY(patman) diff --git a/plugins/opl2/fmopl.c b/plugins/opl2/fmopl.c index f6382b6cb..c8ef05352 100644 --- a/plugins/opl2/fmopl.c +++ b/plugins/opl2/fmopl.c @@ -114,10 +114,9 @@ static int opl_dbg_maxchip,opl_dbg_chip; #define ENV_MOD_AR 0x02 /* -------------------- tables --------------------- */ -static const int slot_array[32]= -{ - 0, 2, 4, 1, 3, 5,-1,-1, - 6, 8,10, 7, 9,11,-1,-1, +static const int slot_array[32]= { + 0, 2, 4, 1, 3, 5,-1,-1, + 6, 8,10, 7, 9,11,-1,-1, 12,14,16,13,15,17,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1 }; @@ -125,57 +124,56 @@ static const int slot_array[32]= /* key scale level */ /* table is 3dB/OCT , DV converts this in TL step at 6dB/OCT */ #define DV (EG_STEP/2) -static const UINT32 KSL_TABLE[8*16]= -{ +static const UINT32 KSL_TABLE[8*16]= { /* OCT 0 */ - 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, - 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, - 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, - 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, + 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, + 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, + 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, + 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, /* OCT 1 */ - 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, - 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, - 0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV, - 1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV, + 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, + 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, + 0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV, + 1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV, /* OCT 2 */ - 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, - 0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV, - 3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV, - 4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV, + 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV, + 0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV, + 3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV, + 4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV, /* OCT 3 */ - 0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV, - 3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV, - 6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV, - 7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV, + 0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV, + 3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV, + 6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV, + 7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV, /* OCT 4 */ - 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV, - 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV, - 9.000/DV, 9.750/DV,10.125/DV,10.500/DV, + 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV, + 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV, + 9.000/DV, 9.750/DV,10.125/DV,10.500/DV, 10.875/DV,11.250/DV,11.625/DV,12.000/DV, /* OCT 5 */ - 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV, - 9.000/DV,10.125/DV,10.875/DV,11.625/DV, + 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV, + 9.000/DV,10.125/DV,10.875/DV,11.625/DV, 12.000/DV,12.750/DV,13.125/DV,13.500/DV, 13.875/DV,14.250/DV,14.625/DV,15.000/DV, /* OCT 6 */ - 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV, + 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV, 12.000/DV,13.125/DV,13.875/DV,14.625/DV, 15.000/DV,15.750/DV,16.125/DV,16.500/DV, 16.875/DV,17.250/DV,17.625/DV,18.000/DV, /* OCT 7 */ - 0.000/DV, 9.000/DV,12.000/DV,13.875/DV, + 0.000/DV, 9.000/DV,12.000/DV,13.875/DV, 15.000/DV,16.125/DV,16.875/DV,17.625/DV, 18.000/DV,18.750/DV,19.125/DV,19.500/DV, 19.875/DV,20.250/DV,20.625/DV,21.000/DV }; #undef DV -/* sustain lebel table (3db per step) */ +/* sustain level table (3db per step) */ /* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/ #define SC(db) (db*((3/EG_STEP)*(1< max ) +#endif + if ( val > max ) { val = max; - else if ( val < min ) + } else if ( val < min ) { val = min; - + } return val; } /* status set and IRQ handling */ -INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag) -{ +#ifdef __clang__ +void OPL_STATUS_SET(FM_OPL *OPL,int flag) { +#else +INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag) { +#endif /* set status flag */ OPL->status |= flag; - if(!(OPL->status & 0x80)) - { - if(OPL->status & OPL->statusmask) - { /* IRQ on */ + if ( !(OPL->status & 0x80) ) { + /* IRQ on */ + if ( OPL->status & OPL->statusmask ) { OPL->status |= 0x80; /* callback user interrupt handler (IRQ is OFF to ON) */ - if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,1); + if (OPL->IRQHandler) { + (OPL->IRQHandler)(OPL->IRQParam,1); + } } } } /* status reset and IRQ handling */ -INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag) -{ +#ifdef __clang__ +void OPL_STATUS_RESET(FM_OPL *OPL,int flag) { +#else +INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag) { +#endif /* reset status flag */ OPL->status &=~flag; - if((OPL->status & 0x80)) - { - if (!(OPL->status & OPL->statusmask) ) - { + if ( (OPL->status & 0x80) ) { + if ( !(OPL->status & OPL->statusmask) ) { OPL->status &= 0x7f; /* callback user interrupt handler (IRQ is ON to OFF) */ - if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,0); + if ( OPL->IRQHandler ) { + (OPL->IRQHandler)(OPL->IRQParam,0); + } } } } /* IRQ mask set */ -INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) -{ +#ifdef __clang__ +void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) { +#else +INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) { +#endif OPL->statusmask = flag; /* IRQ handling check */ OPL_STATUS_SET(OPL,0); @@ -295,8 +307,11 @@ INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) } /* ----- key on ----- */ -INLINE void OPL_KEYON(OPL_SLOT *SLOT) -{ +#ifdef __clang__ +void OPL_KEYON(OPL_SLOT *SLOT) { +#else +INLINE void OPL_KEYON(OPL_SLOT *SLOT) { +#endif /* sin wave restart */ SLOT->Cnt = 0; /* set attack */ @@ -306,15 +321,18 @@ INLINE void OPL_KEYON(OPL_SLOT *SLOT) SLOT->eve = EG_AED; } /* ----- key off ----- */ -INLINE void OPL_KEYOFF(OPL_SLOT *SLOT) -{ - if( SLOT->evm > ENV_MOD_RR) - { +#ifdef __clang__ +void OPL_KEYOFF(OPL_SLOT *SLOT) { +#else +INLINE void OPL_KEYOFF(OPL_SLOT *SLOT) { +#endif + if( SLOT->evm > ENV_MOD_RR) { /* set envelope counter from envleope output */ SLOT->evm = ENV_MOD_RR; - if( !(SLOT->evc&EG_DST) ) + if( !(SLOT->evc&EG_DST) ) { //SLOT->evc = (ENV_CURVE[SLOT->evc>>ENV_BITS]<evc = EG_DST; + } SLOT->eve = EG_DED; SLOT->evs = SLOT->evsr; } @@ -322,62 +340,65 @@ INLINE void OPL_KEYOFF(OPL_SLOT *SLOT) /* ---------- calcrate Envelope Generator & Phase Generator ---------- */ /* return : envelope output */ -INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT ) -{ +#ifdef __clang__ +UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT ) { +#else +INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT ) { +#endif /* calcrate envelope generator */ - if( (SLOT->evc+=SLOT->evs) >= SLOT->eve ) - { + if( (SLOT->evc+=SLOT->evs) >= SLOT->eve ) { switch( SLOT->evm ){ - case ENV_MOD_AR: /* ATTACK -> DECAY1 */ - /* next DR */ - SLOT->evm = ENV_MOD_DR; - SLOT->evc = EG_DST; - SLOT->eve = SLOT->SL; - SLOT->evs = SLOT->evsd; - break; - case ENV_MOD_DR: /* DECAY -> SL or RR */ - SLOT->evc = SLOT->SL; - SLOT->eve = EG_DED; - if(SLOT->eg_typ) - { + case ENV_MOD_AR: /* ATTACK -> DECAY1 */ + /* next DR */ + SLOT->evm = ENV_MOD_DR; + SLOT->evc = EG_DST; + SLOT->eve = SLOT->SL; + SLOT->evs = SLOT->evsd; + break; + case ENV_MOD_DR: /* DECAY -> SL or RR */ + SLOT->evc = SLOT->SL; + SLOT->eve = EG_DED; + if(SLOT->eg_typ) + { + SLOT->evs = 0; + } + else + { + SLOT->evm = ENV_MOD_RR; + SLOT->evs = SLOT->evsr; + } + break; + case ENV_MOD_RR: /* RR -> OFF */ + SLOT->evc = EG_OFF; + SLOT->eve = EG_OFF+1; SLOT->evs = 0; + break; } - else - { - SLOT->evm = ENV_MOD_RR; - SLOT->evs = SLOT->evsr; - } - break; - case ENV_MOD_RR: /* RR -> OFF */ - SLOT->evc = EG_OFF; - SLOT->eve = EG_OFF+1; - SLOT->evs = 0; - break; - } } /* calcrate envelope */ return SLOT->TLL+ENV_CURVE[SLOT->evc>>ENV_BITS]+(SLOT->ams ? ams : 0); } /* set algorythm connection */ -static void set_algorythm( OPL_CH *CH) -{ +static void set_algorythm( OPL_CH *CH) { INT32 *carrier = &outd[0]; CH->connect1 = CH->CON ? carrier : &feedback2; CH->connect2 = carrier; } /* ---------- frequency counter for operater update ---------- */ -INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) -{ +#ifdef __clang__ +void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) { +#else +INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) { +#endif int ksr; /* frequency step counter */ SLOT->Incr = CH->fc * SLOT->mul; ksr = CH->kcode >> SLOT->KSR; - if( SLOT->ksr != ksr ) - { + if ( SLOT->ksr != ksr ) { SLOT->ksr = ksr; /* attack , decay rate recalcration */ SLOT->evsa = SLOT->AR[ksr]; @@ -388,8 +409,12 @@ INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) } /* set multi,am,vib,EG-TYP,KSR,mul */ -INLINE void set_mul(FM_OPL *OPL,int slot,int v) -{ +#ifdef __clang__ +void set_mul(FM_OPL *OPL,int slot,int v) { +#else +INLINE void set_mul(FM_OPL *OPL,int slot,int v) { +#endif + OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; @@ -402,8 +427,12 @@ INLINE void set_mul(FM_OPL *OPL,int slot,int v) } /* set ksl & tl */ -INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v) -{ +#ifdef __clang__ +void set_ksl_tl(FM_OPL *OPL,int slot,int v) { +#else +INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v) { +#endif + OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; int ksl = v>>6; /* 0 / 1.5 / 3 / 6 db/OCT */ @@ -411,15 +440,18 @@ INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v) SLOT->ksl = ksl ? 3-ksl : 31; SLOT->TL = (v&0x3f)*(0.75/EG_STEP); /* 0.75db step */ - if( !(OPL->mode&0x80) ) - { /* not CSM latch total level */ + if ( !(OPL->mode&0x80) ) { /* not CSM latch total level */ SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl); } } /* set attack rate & decay rate */ -INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v) -{ +#ifdef __clang__ +void set_ar_dr(FM_OPL *OPL,int slot,int v) { +#else +INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v) { +#endif + OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; int ar = v>>4; @@ -427,33 +459,48 @@ INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v) SLOT->AR = ar ? &OPL->AR_TABLE[ar<<2] : RATE_0; SLOT->evsa = SLOT->AR[SLOT->ksr]; - if( SLOT->evm == ENV_MOD_AR ) SLOT->evs = SLOT->evsa; + if ( SLOT->evm == ENV_MOD_AR ) { + SLOT->evs = SLOT->evsa; + } SLOT->DR = dr ? &OPL->DR_TABLE[dr<<2] : RATE_0; SLOT->evsd = SLOT->DR[SLOT->ksr]; - if( SLOT->evm == ENV_MOD_DR ) SLOT->evs = SLOT->evsd; + + if ( SLOT->evm == ENV_MOD_DR ) { + SLOT->evs = SLOT->evsd; + } } /* set sustain level & release rate */ -INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v) -{ +#ifdef __clang__ +void set_sl_rr(FM_OPL *OPL,int slot,int v) { +#else +INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v) { +#endif OPL_CH *CH = &OPL->P_CH[slot/2]; OPL_SLOT *SLOT = &CH->SLOT[slot&1]; int sl = v>>4; int rr = v & 0x0f; SLOT->SL = SL_TABLE[sl]; - if( SLOT->evm == ENV_MOD_DR ) SLOT->eve = SLOT->SL; + if ( SLOT->evm == ENV_MOD_DR ) { + SLOT->eve = SLOT->SL; + } SLOT->RR = &OPL->DR_TABLE[rr<<2]; SLOT->evsr = SLOT->RR[SLOT->ksr]; - if( SLOT->evm == ENV_MOD_RR ) SLOT->evs = SLOT->evsr; + if ( SLOT->evm == ENV_MOD_RR ) { + SLOT->evs = SLOT->evsr; + } } /* operator output calcrator */ #define OP_OUT(slot,env,con) slot->wavetable[((slot->Cnt+con)/(0x1000000/SIN_ENT))&(SIN_ENT-1)][env] /* ---------- calcrate one of channel ---------- */ -INLINE void OPL_CALC_CH( OPL_CH *CH ) -{ +#ifdef __clang__ +void OPL_CALC_CH( OPL_CH *CH ) { +#else +INLINE void OPL_CALC_CH( OPL_CH *CH ) { +#endif UINT32 env_out; OPL_SLOT *SLOT; @@ -461,35 +508,35 @@ INLINE void OPL_CALC_CH( OPL_CH *CH ) /* SLOT 1 */ SLOT = &CH->SLOT[SLOT1]; env_out=OPL_CALC_SLOT(SLOT); - if( env_out < EG_ENT-1 ) - { + if( env_out < EG_ENT-1 ) { /* PG */ - if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE); - else SLOT->Cnt += SLOT->Incr; + if (SLOT->vib) { + SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE); + } else { + SLOT->Cnt += SLOT->Incr; + } /* connectoion */ - if(CH->FB) - { + if(CH->FB) { int feedback1 = (CH->op1_out[0]+CH->op1_out[1])>>CH->FB; CH->op1_out[1] = CH->op1_out[0]; *CH->connect1 += CH->op1_out[0] = OP_OUT(SLOT,env_out,feedback1); - } - else - { + } else { *CH->connect1 += OP_OUT(SLOT,env_out,0); } - }else - { + } else { CH->op1_out[1] = CH->op1_out[0]; CH->op1_out[0] = 0; } /* SLOT 2 */ SLOT = &CH->SLOT[SLOT2]; env_out=OPL_CALC_SLOT(SLOT); - if( env_out < EG_ENT-1 ) - { + if ( env_out < EG_ENT-1 ) { /* PG */ - if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE); - else SLOT->Cnt += SLOT->Incr; + if (SLOT->vib) { + SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE); + } else { + SLOT->Cnt += SLOT->Incr; + } /* connectoion */ outd[0] += OP_OUT(SLOT,env_out, feedback2); } @@ -497,8 +544,11 @@ INLINE void OPL_CALC_CH( OPL_CH *CH ) /* ---------- calcrate rythm block ---------- */ #define WHITE_NOISE_db 6.0 -INLINE void OPL_CALC_RH( OPL_CH *CH ) -{ +#ifdef __clang__ +void OPL_CALC_RH( OPL_CH *CH ) { +#else +INLINE void OPL_CALC_RH( OPL_CH *CH ) { +#endif UINT32 env_tam,env_sd,env_top,env_hh; int whitenoise = (rand()&1)*(WHITE_NOISE_db/EG_STEP); INT32 tone8; @@ -511,24 +561,22 @@ INLINE void OPL_CALC_RH( OPL_CH *CH ) /* SLOT 1 */ SLOT = &CH[6].SLOT[SLOT1]; env_out=OPL_CALC_SLOT(SLOT); - if( env_out < EG_ENT-1 ) - { + if ( env_out < EG_ENT-1 ) { /* PG */ - if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE); - else SLOT->Cnt += SLOT->Incr; + if (SLOT->vib) { + SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE); + } else { + SLOT->Cnt += SLOT->Incr; + } /* connectoion */ - if(CH[6].FB) - { + if(CH[6].FB) { int feedback1 = (CH[6].op1_out[0]+CH[6].op1_out[1])>>CH[6].FB; CH[6].op1_out[1] = CH[6].op1_out[0]; feedback2 = CH[6].op1_out[0] = OP_OUT(SLOT,env_out,feedback1); - } - else - { + } else { feedback2 = OP_OUT(SLOT,env_out,0); } - }else - { + } else { feedback2 = 0; CH[6].op1_out[1] = CH[6].op1_out[0]; CH[6].op1_out[0] = 0; @@ -536,11 +584,13 @@ INLINE void OPL_CALC_RH( OPL_CH *CH ) /* SLOT 2 */ SLOT = &CH[6].SLOT[SLOT2]; env_out=OPL_CALC_SLOT(SLOT); - if( env_out < EG_ENT-1 ) - { + if( env_out < EG_ENT-1 ) { /* PG */ - if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE); - else SLOT->Cnt += SLOT->Incr; + if (SLOT->vib) { + SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE); + } else { + SLOT->Cnt += SLOT->Incr; + } /* connectoion */ outd[0] += OP_OUT(SLOT,env_out, feedback2)*2; } @@ -555,106 +605,121 @@ INLINE void OPL_CALC_RH( OPL_CH *CH ) env_hh =OPL_CALC_SLOT(SLOT7_1) + whitenoise; /* PG */ - if(SLOT7_1->vib) SLOT7_1->Cnt += (2*SLOT7_1->Incr*vib/VIB_RATE); - else SLOT7_1->Cnt += 2*SLOT7_1->Incr; - if(SLOT7_2->vib) SLOT7_2->Cnt += ((CH[7].fc*8)*vib/VIB_RATE); - else SLOT7_2->Cnt += (CH[7].fc*8); - if(SLOT8_1->vib) SLOT8_1->Cnt += (SLOT8_1->Incr*vib/VIB_RATE); - else SLOT8_1->Cnt += SLOT8_1->Incr; - if(SLOT8_2->vib) SLOT8_2->Cnt += ((CH[8].fc*48)*vib/VIB_RATE); - else SLOT8_2->Cnt += (CH[8].fc*48); + if(SLOT7_1->vib) { + SLOT7_1->Cnt += (2*SLOT7_1->Incr*vib/VIB_RATE); + } else { + SLOT7_1->Cnt += 2*SLOT7_1->Incr; + } + if (SLOT7_2->vib) { + SLOT7_2->Cnt += ((CH[7].fc*8)*vib/VIB_RATE); + } else { + SLOT7_2->Cnt += (CH[7].fc*8); + } + if (SLOT8_1->vib) { + SLOT8_1->Cnt += (SLOT8_1->Incr*vib/VIB_RATE); + } else { + SLOT8_1->Cnt += SLOT8_1->Incr; + } + if (SLOT8_2->vib) { + SLOT8_2->Cnt += ((CH[8].fc*48)*vib/VIB_RATE); + } + else { + SLOT8_2->Cnt += (CH[8].fc*48); + } tone8 = OP_OUT(SLOT8_2,whitenoise,0 ); /* SD */ - if( env_sd < EG_ENT-1 ) + if( env_sd < EG_ENT-1 ) { outd[0] += OP_OUT(SLOT7_1,env_sd, 0)*8; + } /* TAM */ - if( env_tam < EG_ENT-1 ) + if( env_tam < EG_ENT-1 ) { outd[0] += OP_OUT(SLOT8_1,env_tam, 0)*2; + } /* TOP-CY */ - if( env_top < EG_ENT-1 ) + if( env_top < EG_ENT-1 ) { outd[0] += OP_OUT(SLOT7_2,env_top,tone8)*2; + } /* HH */ - if( env_hh < EG_ENT-1 ) + if( env_hh < EG_ENT-1 ) { outd[0] += OP_OUT(SLOT7_2,env_hh,tone8)*2; + } } /* ----------- initialize time tabls ----------- */ -static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE ) -{ +static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE ) { int i; double rate; /* make attack rate & decay rate tables */ - for (i = 0;i < 4;i++) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; - for (i = 4;i <= 60;i++){ - rate = OPL->freqbase; /* frequency rate */ - if( i < 60 ) rate *= 1.0+(i&3)*0.25; /* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ - rate *= 1<<((i>>2)-1); /* b2-5 : shift bit */ - rate *= (double)(EG_ENT<AR_TABLE[i] = rate / ARRATE; - OPL->DR_TABLE[i] = rate / DRRATE; + for ( i = 0; i < 4; i++ ) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; { + for (i = 4; i <= 60; i++) { + rate = OPL->freqbase; /* frequency rate */ + if( i < 60 ) { + rate *= 1.0+(i&3)*0.25; /* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ + } + rate *= 1<<((i>>2)-1); /* b2-5 : shift bit */ + rate *= (double)(EG_ENT<AR_TABLE[i] = rate / ARRATE; + OPL->DR_TABLE[i] = rate / DRRATE; + } + for ( i = 60; i < 75; i++ ) { + OPL->AR_TABLE[i] = EG_AED-1; + OPL->DR_TABLE[i] = OPL->DR_TABLE[60]; + } + #if 0 + for ( i = 0; i < 64 ; i++ ) { /* make for overflow area */ + LOG(LOG_WAR,("rate %2d , ar %f ms , dr %f ms \n",i, + ((double)(EG_ENT<AR_TABLE[i]) * (1000.0 / OPL->rate), + ((double)(EG_ENT<DR_TABLE[i]) * (1000.0 / OPL->rate) )); + } + #endif } - for (i = 60;i < 75;i++) - { - OPL->AR_TABLE[i] = EG_AED-1; - OPL->DR_TABLE[i] = OPL->DR_TABLE[60]; - } -#if 0 - for (i = 0;i < 64 ;i++){ /* make for overflow area */ - LOG(LOG_WAR,("rate %2d , ar %f ms , dr %f ms \n",i, - ((double)(EG_ENT<AR_TABLE[i]) * (1000.0 / OPL->rate), - ((double)(EG_ENT<DR_TABLE[i]) * (1000.0 / OPL->rate) )); - } -#endif } /* ---------- generic table initialize ---------- */ -static int OPLOpenTable( void ) -{ +static int OPLOpenTable( void ) { int s,t; double rate; int i,j; double pom; /* allocate dynamic tables */ - if( (TL_TABLE = malloc(TL_MAX*2*sizeof(INT32))) == NULL) + if ( (TL_TABLE = malloc(TL_MAX*2*sizeof(INT32))) == NULL ) { return 0; - if( (SIN_TABLE = malloc(SIN_ENT*4 *sizeof(INT32 *))) == NULL) - { + } + if ( (SIN_TABLE = malloc(SIN_ENT*4 *sizeof(INT32 *))) == NULL ) { free(TL_TABLE); return 0; } - if( (AMS_TABLE = malloc(AMS_ENT*2 *sizeof(INT32))) == NULL) - { + if ( (AMS_TABLE = malloc(AMS_ENT*2 *sizeof(INT32))) == NULL ) { free(TL_TABLE); free(SIN_TABLE); return 0; } - if( (VIB_TABLE = malloc(VIB_ENT*2 *sizeof(INT32))) == NULL) - { + if ( (VIB_TABLE = malloc(VIB_ENT*2 *sizeof(INT32))) == NULL ) { free(TL_TABLE); free(SIN_TABLE); free(AMS_TABLE); return 0; } /* make total level table */ - for (t = 0;t < EG_ENT-1 ;t++){ + for ( t = 0; t < EG_ENT-1; t++ ) { rate = ((1< voltage */ TL_TABLE[ t] = (int)rate; TL_TABLE[TL_MAX+t] = -TL_TABLE[t]; /* LOG(LOG_INF,("TotalLevel(%3d) = %x\n",t,TL_TABLE[t]));*/ } /* fill volume off area */ - for ( t = EG_ENT-1; t < TL_MAX ;t++){ + for ( t = EG_ENT-1; t < TL_MAX; t++) { TL_TABLE[t] = TL_TABLE[TL_MAX+t] = 0; } /* make sinwave table (total level offet) */ - /* degree 0 = degree 180 = off */ - SIN_TABLE[0] = SIN_TABLE[SIN_ENT/2] = &TL_TABLE[EG_ENT-1]; - for (s = 1;s <= SIN_ENT/4;s++){ + /* degree 0 = degree 180 = off */ + SIN_TABLE[0] = SIN_TABLE[SIN_ENT/2] = &TL_TABLE[EG_ENT-1]; + for ( s = 1; s <= SIN_ENT/4; s++) { pom = sin(2*PI*s/SIN_ENT); /* sin */ pom = 20*log10(1/pom); /* decibel */ j = pom / EG_STEP; /* TL_TABLE steps */ @@ -665,16 +730,14 @@ static int OPLOpenTable( void ) SIN_TABLE[SIN_ENT/2+s] = SIN_TABLE[SIN_ENT -s] = &TL_TABLE[TL_MAX+j]; /* LOG(LOG_INF,("sin(%3d) = %f:%f db\n",s,pom,(double)j * EG_STEP));*/ } - for (s = 0;s < SIN_ENT;s++) - { + for ( s = 0; s < SIN_ENT; s++) { SIN_TABLE[SIN_ENT*1+s] = s<(SIN_ENT/2) ? SIN_TABLE[s] : &TL_TABLE[EG_ENT]; SIN_TABLE[SIN_ENT*2+s] = SIN_TABLE[s % (SIN_ENT/2)]; SIN_TABLE[SIN_ENT*3+s] = (s/(SIN_ENT/4))&1 ? &TL_TABLE[EG_ENT] : SIN_TABLE[SIN_ENT*2+s]; } /* envelope counter -> envelope output table */ - for (i=0; i= EG_ENT ) pom = EG_ENT-1; */ @@ -685,15 +748,13 @@ static int OPLOpenTable( void ) /* off */ ENV_CURVE[EG_OFF>>ENV_BITS]= EG_ENT-1; /* make LFO ams table */ - for (i=0; iSLOT[SLOT1]; OPL_SLOT *slot2 = &CH->SLOT[SLOT2]; /* all key off */ @@ -730,8 +793,7 @@ INLINE void CSMKeyControll(OPL_CH *CH) } /* ---------- opl initialize ---------- */ -static void OPL_initalize(FM_OPL *OPL) -{ +static void OPL_initalize(FM_OPL *OPL) { int fn; /* frequency base */ @@ -741,8 +803,7 @@ static void OPL_initalize(FM_OPL *OPL) /* make time tables */ init_timetables( OPL , OPL_ARRATE , OPL_DRRATE ); /* make fnumber -> increment counter table */ - for( fn=0 ; fn < 1024 ; fn++ ) - { + for( fn=0 ; fn < 1024 ; fn++ ) { OPL->FN_TABLE[fn] = OPL->freqbase * fn * FREQ_RATE * (1<<7) / 2; } /* LFO freq.table */ @@ -751,227 +812,235 @@ static void OPL_initalize(FM_OPL *OPL) } /* ---------- write a OPL registers ---------- */ -static void OPLWriteReg(FM_OPL *OPL, int r, int v) -{ +static void OPLWriteReg(FM_OPL *OPL, int r, int v) { OPL_CH *CH; int slot; int block_fnum; - switch(r&0xe0) - { + switch ( r&0xe0 ) { case 0x00: /* 00-1f:controll */ - switch(r&0x1f) - { - case 0x01: - /* wave selector enable */ - if(OPL->type&OPL_TYPE_WAVESEL) - { - OPL->wavesel = v&0x20; - if(!OPL->wavesel) + switch ( r&0x1f ) { + case 0x01: + /* wave selector enable */ + if(OPL->type&OPL_TYPE_WAVESEL) { - /* preset compatible mode */ - int c; - for(c=0;cmax_ch;c++) + OPL->wavesel = v&0x20; + if( !OPL->wavesel ) { - OPL->P_CH[c].SLOT[SLOT1].wavetable = &SIN_TABLE[0]; - OPL->P_CH[c].SLOT[SLOT2].wavetable = &SIN_TABLE[0]; + /* preset compatible mode */ + int c; + for ( c=0; cmax_ch; c++ ) + { + OPL->P_CH[c].SLOT[SLOT1].wavetable = &SIN_TABLE[0]; + OPL->P_CH[c].SLOT[SLOT2].wavetable = &SIN_TABLE[0]; + } } } - } - return; - case 0x02: /* Timer 1 */ - OPL->T[0] = (256-v)*4; - break; - case 0x03: /* Timer 2 */ - OPL->T[1] = (256-v)*16; - return; - case 0x04: /* IRQ clear / mask and Timer enable */ - if(v&0x80) - { /* IRQ flag clear */ - OPL_STATUS_RESET(OPL,0x7f); - } - else - { /* set IRQ mask ,timer enable*/ - UINT8 st1 = v&1; - UINT8 st2 = (v>>1)&1; - /* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */ - OPL_STATUS_RESET(OPL,v&0x78); - OPL_STATUSMASK_SET(OPL,((~v)&0x78)|0x01); - /* timer 2 */ - if(OPL->st[1] != st2) - { - double interval = st2 ? (double)OPL->T[1]*OPL->TimerBase : 0.0; - OPL->st[1] = st2; - if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+1,interval); + return; + case 0x02: /* Timer 1 */ + OPL->T[0] = (256-v)*4; + break; + case 0x03: /* Timer 2 */ + OPL->T[1] = (256-v)*16; + return; + case 0x04: /* IRQ clear / mask and Timer enable */ + if ( v&0x80 ) { /* IRQ flag clear */ + OPL_STATUS_RESET(OPL,0x7f); } - /* timer 1 */ - if(OPL->st[0] != st1) - { - double interval = st1 ? (double)OPL->T[0]*OPL->TimerBase : 0.0; - OPL->st[0] = st1; - if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+0,interval); + else { /* set IRQ mask ,timer enable*/ + UINT8 st1 = v&1; + UINT8 st2 = (v>>1)&1; + /* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */ + OPL_STATUS_RESET(OPL,v&0x78); + OPL_STATUSMASK_SET(OPL,((~v)&0x78)|0x01); + /* timer 2 */ + if ( OPL->st[1] != st2 ) { + double interval = st2 ? (double)OPL->T[1]*OPL->TimerBase : 0.0; + OPL->st[1] = st2; + if ( OPL->TimerHandler ) { + (OPL->TimerHandler)(OPL->TimerParam+1,interval); + } + } + /* timer 1 */ + if ( OPL->st[0] != st1 ) { + double interval = st1 ? (double)OPL->T[0]*OPL->TimerBase : 0.0; + OPL->st[0] = st1; + if ( OPL->TimerHandler ) { + (OPL->TimerHandler)(OPL->TimerParam+0,interval); + } + } } - } - return; -#if BUILD_Y8950 - case 0x06: /* Key Board OUT */ - if(OPL->type&OPL_TYPE_KEYBOARD) - { - if(OPL->keyboardhandler_w) - OPL->keyboardhandler_w(OPL->keyboard_param,v); - else - LOG(LOG_WAR,("OPL:write unmapped KEYBOARD port\n")); - } - return; - case 0x07: /* DELTA-T controll : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */ - if(OPL->type&OPL_TYPE_ADPCM) - YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v); - return; - case 0x08: /* MODE,DELTA-T : CSM,NOTESEL,x,x,smpl,da/ad,64k,rom */ - OPL->mode = v; - v&=0x1f; /* for DELTA-T unit */ - case 0x09: /* START ADD */ - case 0x0a: - case 0x0b: /* STOP ADD */ - case 0x0c: - case 0x0d: /* PRESCALE */ - case 0x0e: - case 0x0f: /* ADPCM data */ - case 0x10: /* DELTA-N */ - case 0x11: /* DELTA-N */ - case 0x12: /* EG-CTRL */ - if(OPL->type&OPL_TYPE_ADPCM) - YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v); - return; -#if 0 - case 0x15: /* DAC data */ - case 0x16: - case 0x17: /* SHIFT */ - return; - case 0x18: /* I/O CTRL (Direction) */ - if(OPL->type&OPL_TYPE_IO) - OPL->portDirection = v&0x0f; - return; - case 0x19: /* I/O DATA */ - if(OPL->type&OPL_TYPE_IO) - { - OPL->portLatch = v; - if(OPL->porthandler_w) - OPL->porthandler_w(OPL->port_param,v&OPL->portDirection); - } - return; - case 0x1a: /* PCM data */ - return; -#endif -#endif + return; + #if BUILD_Y8950 + case 0x06: /* Key Board OUT */ + if ( OPL->type&OPL_TYPE_KEYBOARD ) { + if ( OPL->keyboardhandler_w ) { + OPL->keyboardhandler_w(OPL->keyboard_param,v); + } + else { + LOG(LOG_WAR,("OPL:write unmapped KEYBOARD port\n")); + } + } + return; + case 0x07: /* DELTA-T controll : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */ + if ( OPL->type&OPL_TYPE_ADPCM ) { + YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v); + } + return; + case 0x08: /* MODE,DELTA-T : CSM,NOTESEL,x,x,smpl,da/ad,64k,rom */ + OPL->mode = v; + v&=0x1f; /* for DELTA-T unit */ + case 0x09: /* START ADD */ + case 0x0a: + case 0x0b: /* STOP ADD */ + case 0x0c: + case 0x0d: /* PRESCALE */ + case 0x0e: + case 0x0f: /* ADPCM data */ + case 0x10: /* DELTA-N */ + case 0x11: /* DELTA-N */ + case 0x12: /* EG-CTRL */ + if ( OPL->type&OPL_TYPE_ADPCM ) { + YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v); + } + return; + #if 0 + case 0x15: /* DAC data */ + case 0x16: + case 0x17: /* SHIFT */ + return; + case 0x18: /* I/O CTRL (Direction) */ + if ( OPL->type&OPL_TYPE_IO ) { + OPL->portDirection = v&0x0f; + } + return; + case 0x19: /* I/O DATA */ + if ( OPL->type&OPL_TYPE_IO ) { + OPL->portLatch = v; + if ( OPL->porthandler_w ) { + OPL->porthandler_w(OPL->port_param,v&OPL->portDirection); + } + } + return; + case 0x1a: /* PCM data */ + return; + #endif + #endif } break; case 0x20: /* am,vib,ksr,eg type,mul */ slot = slot_array[r&0x1f]; - if(slot == -1) return; + if ( slot == -1 ) { + return; + } set_mul(OPL,slot,v); return; case 0x40: slot = slot_array[r&0x1f]; - if(slot == -1) return; + if ( slot == -1 ) { + return; + } set_ksl_tl(OPL,slot,v); return; case 0x60: slot = slot_array[r&0x1f]; - if(slot == -1) return; + if ( slot == -1 ) { + return; + } set_ar_dr(OPL,slot,v); return; case 0x80: slot = slot_array[r&0x1f]; - if(slot == -1) return; + if ( slot == -1 ) { + return; + } set_sl_rr(OPL,slot,v); return; case 0xa0: - switch(r) - { - case 0xbd: + switch ( r ) { /* amsep,vibdep,r,bd,sd,tom,tc,hh */ - { - UINT8 rkey = OPL->rythm^v; - OPL->ams_table = &AMS_TABLE[v&0x80 ? AMS_ENT : 0]; - OPL->vib_table = &VIB_TABLE[v&0x40 ? VIB_ENT : 0]; - OPL->rythm = v&0x3f; - if(OPL->rythm&0x20) - { + case 0xbd: { + UINT8 rkey = OPL->rythm^v; + OPL->ams_table = &AMS_TABLE[v&0x80 ? AMS_ENT : 0]; + OPL->vib_table = &VIB_TABLE[v&0x40 ? VIB_ENT : 0]; + OPL->rythm = v&0x3f; + if(OPL->rythm&0x20) { #if 0 - usrintf_showmessage("OPL Rythm mode select"); + usrintf_showmessage("OPL Rythm mode select"); #endif - /* BD key on/off */ - if(rkey&0x10) - { - if(v&0x10) - { - OPL->P_CH[6].op1_out[0] = OPL->P_CH[6].op1_out[1] = 0; - OPL_KEYON(&OPL->P_CH[6].SLOT[SLOT1]); - OPL_KEYON(&OPL->P_CH[6].SLOT[SLOT2]); + /* BD key on/off */ + if ( rkey&0x10 ) { + if ( v&0x10 ) { + OPL->P_CH[6].op1_out[0] = OPL->P_CH[6].op1_out[1] = 0; + OPL_KEYON(&OPL->P_CH[6].SLOT[SLOT1]); + OPL_KEYON(&OPL->P_CH[6].SLOT[SLOT2]); + } else { + OPL_KEYOFF(&OPL->P_CH[6].SLOT[SLOT1]); + OPL_KEYOFF(&OPL->P_CH[6].SLOT[SLOT2]); + } } - else - { - OPL_KEYOFF(&OPL->P_CH[6].SLOT[SLOT1]); - OPL_KEYOFF(&OPL->P_CH[6].SLOT[SLOT2]); + /* SD key on/off */ + if ( rkey&0x08 ) { + if ( v&0x08 ) { + OPL_KEYON(&OPL->P_CH[7].SLOT[SLOT2]); + } else { + OPL_KEYOFF(&OPL->P_CH[7].SLOT[SLOT2]); + } + }/* TAM key on/off */ + if ( rkey&0x04 ) { + if ( v&0x04 ) { + OPL_KEYON(&OPL->P_CH[8].SLOT[SLOT1]); + } else { + OPL_KEYOFF(&OPL->P_CH[8].SLOT[SLOT1]); + } + } + /* TOP-CY key on/off */ + if ( rkey&0x02 ) { + if ( v&0x02 ) { + OPL_KEYON(&OPL->P_CH[8].SLOT[SLOT2]); + } else { + OPL_KEYOFF(&OPL->P_CH[8].SLOT[SLOT2]); + } + } + /* HH key on/off */ + if ( rkey&0x01 ) { + if ( v&0x01 ) { + OPL_KEYON(&OPL->P_CH[7].SLOT[SLOT1]); + } + else { + OPL_KEYOFF(&OPL->P_CH[7].SLOT[SLOT1]); + } } } - /* SD key on/off */ - if(rkey&0x08) - { - if(v&0x08) OPL_KEYON(&OPL->P_CH[7].SLOT[SLOT2]); - else OPL_KEYOFF(&OPL->P_CH[7].SLOT[SLOT2]); - }/* TAM key on/off */ - if(rkey&0x04) - { - if(v&0x04) OPL_KEYON(&OPL->P_CH[8].SLOT[SLOT1]); - else OPL_KEYOFF(&OPL->P_CH[8].SLOT[SLOT1]); - } - /* TOP-CY key on/off */ - if(rkey&0x02) - { - if(v&0x02) OPL_KEYON(&OPL->P_CH[8].SLOT[SLOT2]); - else OPL_KEYOFF(&OPL->P_CH[8].SLOT[SLOT2]); - } - /* HH key on/off */ - if(rkey&0x01) - { - if(v&0x01) OPL_KEYON(&OPL->P_CH[7].SLOT[SLOT1]); - else OPL_KEYOFF(&OPL->P_CH[7].SLOT[SLOT1]); - } - } } return; } /* keyon,block,fnum */ - if( (r&0x0f) > 8) return; + if ( (r&0x0f) > 8 ) { + return; + } CH = &OPL->P_CH[r&0x0f]; - if(!(r&0x10)) - { /* a0-a8 */ + /* a0-a8 */ + if ( !(r&0x10) ) { block_fnum = (CH->block_fnum&0x1f00) | v; } - else - { /* b0-b8 */ + /* b0-b8 */ + else { int keyon = (v>>5)&1; block_fnum = ((v&0x1f)<<8) | (CH->block_fnum&0xff); - if(CH->keyon != keyon) - { - if( (CH->keyon=keyon) ) - { + if ( CH->keyon != keyon ) { + if ( (CH->keyon=keyon) ) { CH->op1_out[0] = CH->op1_out[1] = 0; OPL_KEYON(&CH->SLOT[SLOT1]); OPL_KEYON(&CH->SLOT[SLOT2]); - } - else - { + } else { OPL_KEYOFF(&CH->SLOT[SLOT1]); OPL_KEYOFF(&CH->SLOT[SLOT2]); } } } /* update */ - if(CH->block_fnum != block_fnum) - { + if(CH->block_fnum != block_fnum) { int blockRv = 7-(block_fnum>>10); int fnum = block_fnum&0x3ff; CH->block_fnum = block_fnum; @@ -979,28 +1048,33 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) CH->ksl_base = KSL_TABLE[block_fnum>>6]; CH->fc = OPL->FN_TABLE[fnum]>>blockRv; CH->kcode = CH->block_fnum>>9; - if( (OPL->mode&0x40) && CH->block_fnum&0x100) CH->kcode |=1; + if ( (OPL->mode&0x40) && CH->block_fnum&0x100 ) { + CH->kcode |=1; + } CALC_FCSLOT(CH,&CH->SLOT[SLOT1]); CALC_FCSLOT(CH,&CH->SLOT[SLOT2]); } return; case 0xc0: /* FB,C */ - if( (r&0x0f) > 8) return; + if ( (r&0x0f) > 8 ) { + return; + } CH = &OPL->P_CH[r&0x0f]; - { + //{ int feedback = (v>>1)&7; CH->FB = feedback ? (8+1) - feedback : 0; CH->CON = v&1; set_algorythm(CH); - } + //} return; case 0xe0: /* wave type */ slot = slot_array[r&0x1f]; - if(slot == -1) return; + if ( slot == -1 ) { + return; + } CH = &OPL->P_CH[slot/2]; - if(OPL->wavesel) - { + if (OPL->wavesel) { /* LOG(LOG_INF,("OPL SLOT %d wave select %d\n",slot,v&3)); */ CH->SLOT[slot&1].wavetable = &SIN_TABLE[(v&0x03)*SIN_ENT]; } @@ -1009,25 +1083,28 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) } /* lock/unlock for common table */ -static int OPL_LockTable(void) -{ +static int OPL_LockTable(void) { num_lock++; - if(num_lock>1) return 0; + if ( num_lock>1 ) { + return 0; + } /* first time */ cur_chip = NULL; /* allocate total level table (128kb space) */ - if( !OPLOpenTable() ) - { + if ( !OPLOpenTable() ) { num_lock--; return -1; } return 0; } -static void OPL_UnLockTable(void) -{ - if(num_lock) num_lock--; - if(num_lock) return; +static void OPL_UnLockTable(void) { + if(num_lock) { + num_lock--; + } + if(num_lock) { + return; + } /* last time */ cur_chip = NULL; OPLCloseTable(); @@ -1039,8 +1116,7 @@ static void OPL_UnLockTable(void) /*******************************************************************************/ /* ---------- update one of chip ----------- */ -void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) -{ +void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) { int i; int data; OPLSAMPLE *buf = buffer; @@ -1049,7 +1125,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) UINT8 rythm = OPL->rythm&0x20; OPL_CH *CH,*R_CH; - if( (void *)OPL != cur_chip ){ + if ( (void *)OPL != cur_chip ) { cur_chip = (void *)OPL; /* channel pointers */ S_CH = OPL->P_CH; @@ -1066,8 +1142,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) vib_table = OPL->vib_table; } R_CH = rythm ? &S_CH[6] : E_CH; - for( i=0; i < length ; i++ ) - { + for ( i=0; i < length ; i++ ) { /* channel A channel B channel C */ /* LFO */ ams = ams_table[(amsCnt+=amsIncr)>>AMS_SHIFT]; @@ -1088,11 +1163,13 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) OPL->amsCnt = amsCnt; OPL->vibCnt = vibCnt; #ifdef OPL_OUTPUT_LOG - if(opl_dbg_fp) - { - for(opl_dbg_chip=0;opl_dbg_chipP_CH; @@ -1131,22 +1207,24 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) vib_table = OPL->vib_table; } R_CH = rythm ? &S_CH[6] : E_CH; - for( i=0; i < length ; i++ ) - { + for ( i=0; i < length ; i++ ) { /* channel A channel B channel C */ /* LFO */ ams = ams_table[(amsCnt+=amsIncr)>>AMS_SHIFT]; vib = vib_table[(vibCnt+=vibIncr)>>VIB_SHIFT]; outd[0] = 0; /* deltaT ADPCM */ - if( DELTAT->portstate ) + if( DELTAT->portstate ) { YM_DELTAT_ADPCM_CALC(DELTAT); + } /* FM part */ - for(CH=S_CH ; CH < R_CH ; CH++) + for ( CH=S_CH ; CH < R_CH ; CH++ ) { OPL_CALC_CH(CH); + } /* Rythn part */ - if(rythm) + if ( rythm ) { OPL_CALC_RH(S_CH); + } /* limit check */ data = Limit( outd[0] , OPL_MAXOUT, OPL_MINOUT ); /* store to sound buffer */ @@ -1155,14 +1233,14 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) OPL->amsCnt = amsCnt; OPL->vibCnt = vibCnt; /* deltaT START flag */ - if( !DELTAT->portstate ) + if ( !DELTAT->portstate ) { OPL->status &= 0xfe; + } } #endif /* ---------- reset one of chip ---------- */ -void OPLResetChip(FM_OPL *OPL) -{ +void OPLResetChip(FM_OPL *OPL) { int c,s; int i; @@ -1174,14 +1252,14 @@ void OPLResetChip(FM_OPL *OPL) OPLWriteReg(OPL,0x02,0); /* Timer1 */ OPLWriteReg(OPL,0x03,0); /* Timer2 */ OPLWriteReg(OPL,0x04,0); /* IRQ mask clear */ - for(i = 0xff ; i >= 0x20 ; i-- ) OPLWriteReg(OPL,i,0); + for ( i = 0xff ; i >= 0x20 ; i-- ) { + OPLWriteReg(OPL,i,0); + } /* reset OPerator paramater */ - for( c = 0 ; c < OPL->max_ch ; c++ ) - { + for ( c = 0 ; c < OPL->max_ch ; c++ ) { OPL_CH *CH = &OPL->P_CH[c]; /* OPL->P_CH[c].PAN = OPN_CENTER; */ - for(s = 0 ; s < 2 ; s++ ) - { + for ( s = 0 ; s < 2 ; s++ ) { /* wave table */ CH->SLOT[s].wavetable = &SIN_TABLE[0]; /* CH->SLOT[s].evm = ENV_MOD_RR; */ @@ -1191,8 +1269,7 @@ void OPLResetChip(FM_OPL *OPL) } } #if BUILD_Y8950 - if(OPL->type&OPL_TYPE_ADPCM) - { + if ( OPL->type&OPL_TYPE_ADPCM ) { YM_DELTAT *DELTAT = OPL->deltat; DELTAT->freqbase = OPL->freqbase; @@ -1206,29 +1283,37 @@ void OPLResetChip(FM_OPL *OPL) /* ---------- Create one of vietual YM3812 ---------- */ /* 'rate' is sampling rate and 'bufsiz' is the size of the */ -FM_OPL *OPLCreate(int type, int clock, int rate) -{ +FM_OPL *OPLCreate(int type, int clock, int rate) { char *ptr; FM_OPL *OPL; int state_size; int max_ch = 9; /* normaly 9 channels */ - if( OPL_LockTable() ==-1) return NULL; + if ( OPL_LockTable() ==-1 ) { + return NULL; + } /* allocate OPL state space */ state_size = sizeof(FM_OPL); state_size += sizeof(OPL_CH)*max_ch; #if BUILD_Y8950 - if(type&OPL_TYPE_ADPCM) state_size+= sizeof(YM_DELTAT); + if ( type&OPL_TYPE_ADPCM ) { + state_size+= sizeof(YM_DELTAT); + } #endif /* allocate memory block */ ptr = malloc(state_size); - if(ptr==NULL) return NULL; + if (ptr==NULL) { + return NULL; + } /* clear */ memset(ptr,0,state_size); OPL = (FM_OPL *)ptr; ptr+=sizeof(FM_OPL); OPL->P_CH = (OPL_CH *)ptr; ptr+=sizeof(OPL_CH)*max_ch; #if BUILD_Y8950 - if(type&OPL_TYPE_ADPCM) OPL->deltat = (YM_DELTAT *)ptr; ptr+=sizeof(YM_DELTAT); + if ( type&OPL_TYPE_ADPCM ) { + OPL->deltat = (YM_DELTAT *)ptr; + ptr+=sizeof(YM_DELTAT); + } #endif /* set channel state pointer */ OPL->type = type; @@ -1240,15 +1325,13 @@ FM_OPL *OPLCreate(int type, int clock, int rate) /* reset chip */ OPLResetChip(OPL); #ifdef OPL_OUTPUT_LOG - if(!opl_dbg_fp) - { + if (!opl_dbg_fp) { opl_dbg_fp = fopen("opllog.opl","wb"); opl_dbg_maxchip = 0; } - if(opl_dbg_fp) - { + if (opl_dbg_fp) { opl_dbg_opl[opl_dbg_maxchip] = OPL; - fprintf(opl_dbg_fp,"%c%c%c%c%c%c",0x00+opl_dbg_maxchip, + fprintf(opl_dbg_fp, "%c%c%c%c%c%c", 0x00+opl_dbg_maxchip, type, clock&0xff, (clock/0x100)&0xff, @@ -1261,11 +1344,9 @@ FM_OPL *OPLCreate(int type, int clock, int rate) } /* ---------- Destroy one of vietual YM3812 ---------- */ -void OPLDestroy(FM_OPL *OPL) -{ +void OPLDestroy(FM_OPL *OPL) { #ifdef OPL_OUTPUT_LOG - if(opl_dbg_fp) - { + if(opl_dbg_fp) { fclose(opl_dbg_fp); opl_dbg_fp = NULL; } @@ -1276,115 +1357,112 @@ void OPLDestroy(FM_OPL *OPL) /* ---------- Option handlers ---------- */ -void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int channelOffset) -{ +void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int channelOffset) { OPL->TimerHandler = TimerHandler; OPL->TimerParam = channelOffset; } -void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,int param) -{ +void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,int param) { OPL->IRQHandler = IRQHandler; OPL->IRQParam = param; } -void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,int param) -{ +void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,int param) { OPL->UpdateHandler = UpdateHandler; OPL->UpdateParam = param; } #if BUILD_Y8950 -void OPLSetPortHandler(FM_OPL *OPL,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,int param) -{ +void OPLSetPortHandler(FM_OPL *OPL,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,int param) { OPL->porthandler_w = PortHandler_w; OPL->porthandler_r = PortHandler_r; OPL->port_param = param; } -void OPLSetKeyboardHandler(FM_OPL *OPL,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,int param) -{ +void OPLSetKeyboardHandler(FM_OPL *OPL,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,int param) { OPL->keyboardhandler_w = KeyboardHandler_w; OPL->keyboardhandler_r = KeyboardHandler_r; OPL->keyboard_param = param; } #endif /* ---------- YM3812 I/O interface ---------- */ -int OPLWrite(FM_OPL *OPL,int a,int v) -{ - if( !(a&1) ) - { /* address port */ +int OPLWrite(FM_OPL *OPL,int a,int v) { + if ( !(a&1) ) { /* address port */ OPL->address = v & 0xff; - } - else - { /* data port */ - if(OPL->UpdateHandler) OPL->UpdateHandler(OPL->UpdateParam,0); + } else { /* data port */ + if ( OPL->UpdateHandler ) { + OPL->UpdateHandler(OPL->UpdateParam,0); + } #ifdef OPL_OUTPUT_LOG - if(opl_dbg_fp) - { - for(opl_dbg_chip=0;opl_dbg_chipaddress,v); - } + if ( opl_dbg_fp ) { + for ( opl_dbg_chip=0; opl_dbg_chipaddress, v); + } #endif OPLWriteReg(OPL,OPL->address,v); } return OPL->status>>7; } -unsigned char OPLRead(FM_OPL *OPL,int a) -{ - if( !(a&1) ) - { /* status port */ +unsigned char OPLRead(FM_OPL *OPL,int a) { + /* status port */ + if( !(a&1) ) { return OPL->status & (OPL->statusmask|0x80); } + /* data port */ - switch(OPL->address) - { - case 0x05: /* KeyBoard IN */ - if(OPL->type&OPL_TYPE_KEYBOARD) - { - if(OPL->keyboardhandler_r) - return OPL->keyboardhandler_r(OPL->keyboard_param); - else - LOG(LOG_WAR,("OPL:read unmapped KEYBOARD port\n")); - } - return 0; -#if 0 - case 0x0f: /* ADPCM-DATA */ - return 0; -#endif - case 0x19: /* I/O DATA */ - if(OPL->type&OPL_TYPE_IO) - { - if(OPL->porthandler_r) - return OPL->porthandler_r(OPL->port_param); - else - LOG(LOG_WAR,("OPL:read unmapped I/O port\n")); - } - return 0; - case 0x1a: /* PCM-DATA */ - return 0; + switch(OPL->address) { + case 0x05: /* KeyBoard IN */ + if ( OPL->type&OPL_TYPE_KEYBOARD ) { + if ( OPL->keyboardhandler_r ) { + return OPL->keyboardhandler_r(OPL->keyboard_param); + } else { + LOG(LOG_WAR,("OPL:read unmapped KEYBOARD port\n")); + } + } + return 0; + #if 0 + case 0x0f: /* ADPCM-DATA */ + return 0; + #endif + case 0x19: /* I/O DATA */ + if ( OPL->type&OPL_TYPE_IO ) { + if ( OPL->porthandler_r ) { + return OPL->porthandler_r(OPL->port_param); + } + else { + LOG(LOG_WAR,("OPL:read unmapped I/O port\n")); + } + } + return 0; + case 0x1a: /* PCM-DATA */ + return 0; } return 0; } -int OPLTimerOver(FM_OPL *OPL,int c) -{ - if( c ) - { /* Timer B */ +int OPLTimerOver(FM_OPL *OPL,int c) { + /* Timer B */ + if( c ) { OPL_STATUS_SET(OPL,0x20); } - else - { /* Timer A */ + /* Timer A */ + else { OPL_STATUS_SET(OPL,0x40); - /* CSM mode key,TL controll */ - if( OPL->mode & 0x80 ) - { /* CSM mode total level latch and auto key on */ + /* CSM mode key,TL control */ + /* CSM mode total level latch and auto key on */ + if( OPL->mode & 0x80 ) { int ch; - if(OPL->UpdateHandler) OPL->UpdateHandler(OPL->UpdateParam,0); - for(ch=0;ch<9;ch++) + if (OPL->UpdateHandler) { + OPL->UpdateHandler(OPL->UpdateParam,0); + } + for ( ch=0; ch<9; ch++ ) { CSMKeyControll( &OPL->P_CH[ch] ); + } } } /* reload timer */ - if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+c,(double)OPL->T[c]*OPL->TimerBase); + if ( OPL->TimerHandler ) { + (OPL->TimerHandler)(OPL->TimerParam+c,(double)OPL->T[c]*OPL->TimerBase); + } return OPL->status>>7; }