Changeset 9711

Show
Ignore:
Timestamp:
10/04/08 12:31:50
Author:
n4hy
Message:

Move work function delay copying to stack

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/developers/n4hy/pfb_fbs/gnuradio-core/src/lib/general/gr_fmdet_cf.cc

    r9710 r9711  
    4444                   gr_make_io_signature (1, 1, sizeof (gr_complex)), 
    4545                   gr_make_io_signature (1, 1, sizeof (float))), 
    46     d_S0(0),d_S1(0),d_S2(0), 
     46    d_S1(0),d_S2(0), 
    4747    d_S3(0),d_S4(0),d_twelveDeltaT(12.0/samplerate) 
    4848 
    …… 
    6262  int   size = noutput_items; 
    6363 
    64   gr_complex Sdot; 
     64  gr_complex Sdot,S0,S1=d_S1,S2=d_S2,S3=d_S3,S4=d_S4; 
    6565 
    6666  while (size-- > 0) { 
    67     d_S0=*iptr++; 
     67    S0=*iptr++; 
    6868 
    6969    Sdot = gr_complex(d_twelveDeltaT* 
    70                       (-d_S0.real() + 8.0*d_S1.real() - 8.0*d_S3.real() + d_S4.real()), 
     70                      (-S0.real() + 8.0*S1.real() - 8.0*S3.real() + S4.real()), 
    7171                      d_twelveDeltaT* 
    72                       (-d_S0.imag() + 8.0*d_S1.imag() - 8.0*d_S3.imag() + d_S4.imag())); 
    73     d_freq = (d_S2.real()*Sdot.imag()-d_S2.imag()*Sdot.real())/ 
    74       (d_S2.real()*d_S2.real()+d_S2.imag()*d_S2.imag()); 
     72                      (-S0.imag() + 8.0*S1.imag() - 8.0*S3.imag() + S4.imag())); 
     73    d_freq = (S2.real()*Sdot.imag()-S2.imag()*Sdot.real())/ 
     74      (S2.real()*S2.real()+S2.imag()*S2.imag()); 
    7575 
    76     d_S4=d_S3; 
    77     d_S3=d_S2; 
    78     d_S2=d_S1; 
    79     d_S1=d_S0; 
     76    S4=S3; 
     77    S3=S2; 
     78    S2=S1; 
     79    S1=S0; 
    8080 
    8181     
    8282    *optr++ = d_freq; 
    8383  } 
     84  d_S1=S1; 
     85  d_S2=S2; 
     86  d_S3=S3; 
     87  d_S4=S4; 
    8488  return noutput_items; 
    8589} 

  • gnuradio/branches/developers/n4hy/pfb_fbs/gnuradio-core/src/lib/general/gr_fmdet_cf.h

    r9710 r9711  
    4545  friend gr_fmdet_cf_sptr gr_make_fmdet_cf (float samplerate); 
    4646 
    47   gr_complex d_S0,d_S1,d_S2,d_S3,d_S4; 
     47  gr_complex d_S1,d_S2,d_S3,d_S4; 
    4848  float d_freq,d_twelveDeltaT; 
    4949  gr_fmdet_cf (float samplerate);