X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fregisters.c;h=20a7c140ca338c81f0916dd8d2bb04b82dd2148e;hp=83b9e438f95555686896d4833d532a68d4728bbb;hb=54933c929d2e418e925ae823e3fa7607b2d5ac85;hpb=1775933abd26d2e282c4e0b4093778d204a0038d diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c index 83b9e438..20a7c140 100644 --- a/plugins/dfsound/registers.c +++ b/plugins/dfsound/registers.c @@ -21,34 +21,42 @@ #include "externals.h" #include "registers.h" -#include "regs.h" -/* -// adsr time values (in ms) by James Higgs ... see the end of -// the adsr.c source for details - -#define ATTACK_MS 514L -#define DECAYHALF_MS 292L -#define DECAY_MS 584L -#define SUSTAIN_MS 450L -#define RELEASE_MS 446L -*/ - -// we have a timebase of 1.020408f ms, not 1 ms... so adjust adsr defines -#define ATTACK_MS 494L -#define DECAYHALF_MS 286L -#define DECAY_MS 572L -#define SUSTAIN_MS 441L -#define RELEASE_MS 437L +static void SoundOn(int start,int end,unsigned short val); +static void SoundOff(int start,int end,unsigned short val); +static void FModOn(int start,int end,unsigned short val); +static void NoiseOn(int start,int end,unsigned short val); +static void SetVolumeL(unsigned char ch,short vol); +static void SetVolumeR(unsigned char ch,short vol); +static void SetPitch(int ch,unsigned short val); +static void ReverbOn(int start,int end,unsigned short val); //////////////////////////////////////////////////////////////////////// // WRITE REGISTERS: called by main emu //////////////////////////////////////////////////////////////////////// -void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) +static const uint32_t ignore_dupe[8] = { + // ch 0-15 c40 c80 cc0 + 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f, + // ch 16-24 d40 control reverb + 0x7f7f7f7f, 0x7f7f7f7f, 0xff05ff0f, 0xffffffff +}; + +void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, + unsigned int cycles) { - const unsigned long r=reg&0xfff; - regArea[(r-0xc00)>>1] = val; + int r = reg & 0xfff; + int rofs = (r - 0xc00) >> 1; + int changed = regArea[rofs] != val; + regArea[rofs] = val; + + if (!changed && (ignore_dupe[rofs >> 5] & (1 << (rofs & 0x1f)))) + return; + // zero keyon/keyoff? + if (val == 0 && (r & 0xff8) == 0xd88) + return; + + do_samples_if_needed(cycles); if(r>=0x0c00 && r<0x0d80) // some channel info? { @@ -66,11 +74,10 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) //------------------------------------------------// pitch case 4: SetPitch(ch,val); - break; + goto upd_irq; //------------------------------------------------// start case 6: - // Brain Dead 13 - align to 16 boundary - s_chan[ch].pStart= spuMemC+(unsigned long)((val<<3)&~0xf); + // taken from regArea later break; //------------------------------------------------// level with pre-calcs case 8: @@ -82,35 +89,6 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) s_chan[ch].ADSRX.DecayRate=(lval>>4) & 0x000f; s_chan[ch].ADSRX.SustainLevel=lval & 0x000f; //---------------------------------------------// -#if 0 - if(!iDebugMode) break; - //---------------------------------------------// stuff below is only for debug mode - - s_chan[ch].ADSR.AttackModeExp=(lval&0x8000)?1:0; //0x007f - - lx=(((lval>>8) & 0x007f)>>2); // attack time to run from 0 to 100% volume - lx=min(31,lx); // no overflow on shift! - if(lx) - { - lx = (1<>4) & 0x000f; // decay: - if(lx) // our const decay value is time it takes from 100% to 0% of volume - { - lx = ((1<<(lx))*DECAY_MS)/10000L; - if(!lx) lx=1; - } - s_chan[ch].ADSR.DecayTime = // so calc how long does it take to run from 100% to the wanted sus level - (lx*(1024-s_chan[ch].ADSR.SustainLevel))/1024; -#endif } break; //------------------------------------------------// adsr times with pre-calcs @@ -125,39 +103,6 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) s_chan[ch].ADSRX.ReleaseModeExp = (lval&0x0020)?1:0; s_chan[ch].ADSRX.ReleaseRate = lval & 0x001f; //----------------------------------------------// -#if 0 - if(!iDebugMode) break; - //----------------------------------------------// stuff below is only for debug mode - - s_chan[ch].ADSR.SustainModeExp = (lval&0x8000)?1:0; - s_chan[ch].ADSR.ReleaseModeExp = (lval&0x0020)?1:0; - - lx=((((lval>>6) & 0x007f)>>2)); // sustain time... often very high - lx=min(31,lx); // values are used to hold the volume - if(lx) // until a sound stop occurs - { // the highest value we reach (due to - lx = (1< no multithread fuckups - s_chan[ch].pLoop=spuMemC+((unsigned long)((val<<3)&~0xf)); - //s_chan[ch].bIgnoreLoop=1; - //ReleaseMutex(s_chan[ch].hMutex); // -> oki, on with the thread - break; + s_chan[ch].pLoop=spuMemC+((val&~1)<<3); + goto upd_irq; //------------------------------------------------// } - iSpuAsyncWait=0; return; } @@ -190,8 +131,11 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) break; //-------------------------------------------------// case H_SPUctrl: - if(!(spuCtrl & CTRL_IRQ)) + if (!(spuCtrl & CTRL_IRQ)) { spuStat&=~STAT_IRQ; + if (val & CTRL_IRQ) + schedule_next_irq(); + } spuCtrl=val; break; //-------------------------------------------------// @@ -211,13 +155,12 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) rvb.CurrAddr=rvb.StartAddr; } } - rvb.dirty = 1; - break; + goto rvbd; //-------------------------------------------------// case H_SPUirqAddr: spuIrq = val; pSpuIrq=spuMemC+(((unsigned long) val<<3)&~0xf); - break; + goto upd_irq; //-------------------------------------------------// case H_SPUrvolL: rvb.VolLeft=val; @@ -303,44 +246,48 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) ReverbOn(16,24,val); break; //-------------------------------------------------// - case H_Reverb+0 : rvb.FB_SRC_A=val*4; break; - case H_Reverb+2 : rvb.FB_SRC_B=val*4; break; - case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; break; - case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; break; - case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; break; - case H_Reverb+10 : rvb.ACC_COEF_C=(short)val; break; - case H_Reverb+12 : rvb.ACC_COEF_D=(short)val; break; - case H_Reverb+14 : rvb.IIR_COEF=(short)val; break; - case H_Reverb+16 : rvb.FB_ALPHA=(short)val; break; - case H_Reverb+18 : rvb.FB_X=(short)val; break; - case H_Reverb+20 : rvb.IIR_DEST_A0=val*4; break; - case H_Reverb+22 : rvb.IIR_DEST_A1=val*4; break; - case H_Reverb+24 : rvb.ACC_SRC_A0=val*4; break; - case H_Reverb+26 : rvb.ACC_SRC_A1=val*4; break; - case H_Reverb+28 : rvb.ACC_SRC_B0=val*4; break; - case H_Reverb+30 : rvb.ACC_SRC_B1=val*4; break; - case H_Reverb+32 : rvb.IIR_SRC_A0=val*4; break; - case H_Reverb+34 : rvb.IIR_SRC_A1=val*4; break; - case H_Reverb+36 : rvb.IIR_DEST_B0=val*4; break; - case H_Reverb+38 : rvb.IIR_DEST_B1=val*4; break; - case H_Reverb+40 : rvb.ACC_SRC_C0=val*4; break; - case H_Reverb+42 : rvb.ACC_SRC_C1=val*4; break; - case H_Reverb+44 : rvb.ACC_SRC_D0=val*4; break; - case H_Reverb+46 : rvb.ACC_SRC_D1=val*4; break; - case H_Reverb+48 : rvb.IIR_SRC_B1=val*4; break; - case H_Reverb+50 : rvb.IIR_SRC_B0=val*4; break; - case H_Reverb+52 : rvb.MIX_DEST_A0=val*4; break; - case H_Reverb+54 : rvb.MIX_DEST_A1=val*4; break; - case H_Reverb+56 : rvb.MIX_DEST_B0=val*4; break; - case H_Reverb+58 : rvb.MIX_DEST_B1=val*4; break; - case H_Reverb+60 : rvb.IN_COEF_L=(short)val; break; - case H_Reverb+62 : rvb.IN_COEF_R=(short)val; break; + case H_Reverb+0 : rvb.FB_SRC_A=val*4; goto rvbd; + case H_Reverb+2 : rvb.FB_SRC_B=val*4; goto rvbd; + case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; goto rvbd; + case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; goto rvbd; + case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; goto rvbd; + case H_Reverb+10 : rvb.ACC_COEF_C=(short)val; goto rvbd; + case H_Reverb+12 : rvb.ACC_COEF_D=(short)val; goto rvbd; + case H_Reverb+14 : rvb.IIR_COEF=(short)val; goto rvbd; + case H_Reverb+16 : rvb.FB_ALPHA=(short)val; goto rvbd; + case H_Reverb+18 : rvb.FB_X=(short)val; goto rvbd; + case H_Reverb+20 : rvb.IIR_DEST_A0=val*4; goto rvbd; + case H_Reverb+22 : rvb.IIR_DEST_A1=val*4; goto rvbd; + case H_Reverb+24 : rvb.ACC_SRC_A0=val*4; goto rvbd; + case H_Reverb+26 : rvb.ACC_SRC_A1=val*4; goto rvbd; + case H_Reverb+28 : rvb.ACC_SRC_B0=val*4; goto rvbd; + case H_Reverb+30 : rvb.ACC_SRC_B1=val*4; goto rvbd; + case H_Reverb+32 : rvb.IIR_SRC_A0=val*4; goto rvbd; + case H_Reverb+34 : rvb.IIR_SRC_A1=val*4; goto rvbd; + case H_Reverb+36 : rvb.IIR_DEST_B0=val*4; goto rvbd; + case H_Reverb+38 : rvb.IIR_DEST_B1=val*4; goto rvbd; + case H_Reverb+40 : rvb.ACC_SRC_C0=val*4; goto rvbd; + case H_Reverb+42 : rvb.ACC_SRC_C1=val*4; goto rvbd; + case H_Reverb+44 : rvb.ACC_SRC_D0=val*4; goto rvbd; + case H_Reverb+46 : rvb.ACC_SRC_D1=val*4; goto rvbd; + case H_Reverb+48 : rvb.IIR_SRC_B1=val*4; goto rvbd; + case H_Reverb+50 : rvb.IIR_SRC_B0=val*4; goto rvbd; + case H_Reverb+52 : rvb.MIX_DEST_A0=val*4; goto rvbd; + case H_Reverb+54 : rvb.MIX_DEST_A1=val*4; goto rvbd; + case H_Reverb+56 : rvb.MIX_DEST_B0=val*4; goto rvbd; + case H_Reverb+58 : rvb.MIX_DEST_B1=val*4; goto rvbd; + case H_Reverb+60 : rvb.IN_COEF_L=(short)val; goto rvbd; + case H_Reverb+62 : rvb.IN_COEF_R=(short)val; goto rvbd; } + return; - if ((r & ~0x3f) == H_Reverb) - rvb.dirty = 1; // recalculate on next update +upd_irq: + if (spuCtrl & CTRL_IRQ) + schedule_next_irq(); + return; - iSpuAsyncWait=0; +rvbd: + rvb.dirty = 1; // recalculate on next update } //////////////////////////////////////////////////////////////////////// @@ -351,8 +298,6 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg) { const unsigned long r=reg&0xfff; - iSpuAsyncWait=0; - if(r>=0x0c00 && r<0x0d80) { switch(r&0x0f) @@ -412,23 +357,24 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg) // SOUND ON register write //////////////////////////////////////////////////////////////////////// -void SoundOn(int start,int end,unsigned short val) // SOUND ON PSX COMAND +static void SoundOn(int start,int end,unsigned short val) { int ch; for(ch=start;ch>=1) // loop channels { - if((val&1) && s_chan[ch].pStart) // mmm... start has to be set before key on !?! + if((val&1) && regAreaGet(ch,6)) // mmm... start has to be set before key on !?! { - s_chan[ch].bIgnoreLoop=0; - // do this here, not in StartSound // - fixes fussy timing issues s_chan[ch].bStop=0; - s_chan[ch].pCurr=s_chan[ch].pStart; + s_chan[ch].pCurr=spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned + s_chan[ch].pLoop=spuMemC+((regAreaGet(ch,14)&~1)<<3); + s_chan[ch].prevflags=2; dwNewChannel|=(1<>=1) // loop channels @@ -457,7 +403,7 @@ void SoundOff(int start,int end,unsigned short val) // SOUND OFF PSX COMMAND // FMOD register write //////////////////////////////////////////////////////////////////////// -void FModOn(int start,int end,unsigned short val) // FMOD ON PSX COMMAND +static void FModOn(int start,int end,unsigned short val) { int ch; @@ -484,7 +430,7 @@ void FModOn(int start,int end,unsigned short val) // FMOD ON PSX COMMAND // NOISE register write //////////////////////////////////////////////////////////////////////// -void NoiseOn(int start,int end,unsigned short val) // NOISE ON PSX COMMAND +static void NoiseOn(int start,int end,unsigned short val) { int ch; @@ -501,7 +447,7 @@ void NoiseOn(int start,int end,unsigned short val) // NOISE ON PSX COMMAND // please note: sweep and phase invert are wrong... but I've never seen // them used -void SetVolumeL(unsigned char ch,short vol) // LEFT VOLUME +static void SetVolumeL(unsigned char ch,short vol) // LEFT VOLUME { if(vol&0x8000) // sweep? { @@ -527,7 +473,7 @@ void SetVolumeL(unsigned char ch,short vol) // LEFT VOLUME // RIGHT VOLUME register write //////////////////////////////////////////////////////////////////////// -void SetVolumeR(unsigned char ch,short vol) // RIGHT VOLUME +static void SetVolumeR(unsigned char ch,short vol) // RIGHT VOLUME { if(vol&0x8000) // comments... see above :) { @@ -553,24 +499,23 @@ void SetVolumeR(unsigned char ch,short vol) // RIGHT VOLUME // PITCH register write //////////////////////////////////////////////////////////////////////// -void SetPitch(int ch,unsigned short val) // SET PITCH +static void SetPitch(int ch,unsigned short val) // SET PITCH { int NP; if(val>0x3fff) NP=0x3fff; // get pitch val else NP=val; s_chan[ch].iRawPitch=NP; - - NP=(44100L*NP)/4096L; // calc frequency - if(NP<1) NP=1; // some security - s_chan[ch].iActFreq=NP; // store frequency + s_chan[ch].sinc=(NP<<4)|8; + s_chan[ch].sinc_inv=0; + if(iUseInterpolation==1) s_chan[ch].SB[32]=1; // -> freq change in simple interpolation mode: set flag } //////////////////////////////////////////////////////////////////////// // REVERB register write //////////////////////////////////////////////////////////////////////// -void ReverbOn(int start,int end,unsigned short val) // REVERB ON PSX COMMAND +static void ReverbOn(int start,int end,unsigned short val) { int ch;