diff options
author | Kinsey Moore <kmoore@digium.com> | 2012-03-22 19:51:16 +0000 |
---|---|---|
committer | Kinsey Moore <kmoore@digium.com> | 2012-03-22 19:51:16 +0000 |
commit | c5b3db1956a3db2446b0310b3a7d59961fe3e089 (patch) | |
tree | 530b55034f5adfb0c7106ae1194679a031afc888 /main/fskmodem_float.c | |
parent | 1d1c28ac4b09df2b663123e55239e411b8f5ad26 (diff) |
Kill off red blobs in most of main/*
Everything still compiled after making these changes, so I assume these
whitespace-only changes didn't break anything (and shouldn't have).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/fskmodem_float.c')
-rw-r--r-- | main/fskmodem_float.c | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/main/fskmodem_float.c b/main/fskmodem_float.c index bc873eac5..6bf2c7553 100644 --- a/main/fskmodem_float.c +++ b/main/fskmodem_float.c @@ -4,7 +4,7 @@ * Copyright (C) 1999 - 2005, Digium, Inc. * * Mark Spencer <markster@digium.com> - * + * * Includes code and algorithms from the Zapata library. * * See http://www.asterisk.org for more information about @@ -20,7 +20,7 @@ /*! \file * - * \brief FSK Modulator/Demodulator + * \brief FSK Modulator/Demodulator * * \author Mark Spencer <markster@digium.com> * @@ -58,23 +58,23 @@ static inline float get_sample(short **buffer, int *len) #define GET_SAMPLE get_sample(&buffer, len) /*! \brief Coefficients for input filters - * Coefficients table, generated by program "mkfilter" + * Coefficients table, generated by program "mkfilter" * mkfilter is part of the zapatatelephony.org distribution * Format: coef[IDX_FREC][IDX_BW][IDX_COEF] - * IDX_COEF = 0 => 1/GAIN - * IDX_COEF = 1-6 => Coefficientes y[n] + * IDX_COEF = 0 => 1/GAIN + * IDX_COEF = 1-6 => Coefficientes y[n] */ static double coef_in[NF][NBW][8] = { { - { 1.8229206611e-04,-7.8997325866e-01,2.2401819940e+00,-4.6751353581e+00,5.5080745712e+00,-5.0571565772e+00,2.6215820004e+00,0.0000000000e+00, }, - { 9.8532175289e-02,-5.6297236492e-02,3.3146713415e-01,-9.2239200436e-01,1.4844365184e+00,-2.0183258642e+00,2.0074154497e+00,0.0000000000e+00, }, - }, - { - { 1.8229206610e-04,-7.8997325866e-01,7.7191410839e-01,-2.8075643964e+00,1.6948618347e+00,-3.0367273700e+00,9.0333559408e-01,0.0000000000e+00, } , - { 9.8531161839e-02,-5.6297236492e-02,1.1421579050e-01,-4.8122536483e-01,4.0121072432e-01,-7.4834487567e-01,6.9170822332e-01,0.0000000000e+00, }, + { 1.8229206611e-04,-7.8997325866e-01,2.2401819940e+00,-4.6751353581e+00,5.5080745712e+00,-5.0571565772e+00,2.6215820004e+00,0.0000000000e+00, }, + { 9.8532175289e-02,-5.6297236492e-02,3.3146713415e-01,-9.2239200436e-01,1.4844365184e+00,-2.0183258642e+00,2.0074154497e+00,0.0000000000e+00, }, + }, + { + { 1.8229206610e-04,-7.8997325866e-01,7.7191410839e-01,-2.8075643964e+00,1.6948618347e+00,-3.0367273700e+00,9.0333559408e-01,0.0000000000e+00, }, + { 9.8531161839e-02,-5.6297236492e-02,1.1421579050e-01,-4.8122536483e-01,4.0121072432e-01,-7.4834487567e-01,6.9170822332e-01,0.0000000000e+00, }, }, { - { 1.8229206611e-04,-7.8997325866e-01,2.9003821430e+00,-6.1082779024e+00,7.7169345751e+00,-6.6075999680e+00,3.3941838836e+00,0.0000000000e+00, }, + { 1.8229206611e-04,-7.8997325866e-01,2.9003821430e+00,-6.1082779024e+00,7.7169345751e+00,-6.6075999680e+00,3.3941838836e+00,0.0000000000e+00, }, { 9.8539686961e-02,-5.6297236492e-02,4.2915323820e-01,-1.2609358633e+00,2.2399213250e+00,-2.9928879142e+00,2.5990173742e+00,0.0000000000e+00, }, }, { @@ -82,24 +82,24 @@ static double coef_in[NF][NBW][8] = { { 9.8531161839e-02,-5.6297236492e-02,-1.1421579050e-01,-4.8122536483e-01,-4.0121072432e-01,-7.4834487567e-01,-6.9170822332e-01,0.0000000000e+00, }, }, { - { 1.8229206611e-04,-7.8997325866e-01,2.5782298908e+00,-5.3629717478e+00,6.5890882172e+00,-5.8012914776e+00,3.0171839130e+00,0.0000000000e+00, }, - { 9.8534230718e-02,-5.6297236492e-02,3.8148618075e-01,-1.0848760410e+00,1.8441165168e+00,-2.4860666655e+00,2.3103384142e+00,0.0000000000e+00, }, + { 1.8229206611e-04,-7.8997325866e-01,2.5782298908e+00,-5.3629717478e+00,6.5890882172e+00,-5.8012914776e+00,3.0171839130e+00,0.0000000000e+00, }, + { 9.8534230718e-02,-5.6297236492e-02,3.8148618075e-01,-1.0848760410e+00,1.8441165168e+00,-2.4860666655e+00,2.3103384142e+00,0.0000000000e+00, }, }, { { 1.8229206610e-04,-7.8997325866e-01,-3.8715051001e-01,-2.6192408538e+00,-8.3977994034e-01,-2.8329897913e+00,-4.5306444352e-01,0.0000000000e+00, }, { 9.8531160936e-02,-5.6297236492e-02,-5.7284484199e-02,-4.3673866734e-01,-1.9564766257e-01,-6.2028156584e-01,-3.4692356122e-01,0.0000000000e+00, }, - }, + }, }; /*! \brief Coefficients for output filter * Coefficients table, generated by program "mkfilter" - * Format: coef[IDX_BW][IDX_COEF] - * IDX_COEF = 0 => 1/GAIN + * Format: coef[IDX_BW][IDX_COEF] + * IDX_COEF = 0 => 1/GAIN * IDX_COEF = 1-6 => Coefficientes y[n] */ static double coef_out[NBW][8] = { { 1.3868644653e-08,-6.3283665042e-01,4.0895057217e+00,-1.1020074592e+01,1.5850766191e+01,-1.2835109292e+01,5.5477477340e+00,0.0000000000e+00, }, - { 3.1262119724e-03,-7.8390522307e-03,8.5209627801e-02,-4.0804129163e-01,1.1157139955e+00,-1.8767603680e+00,1.8916395224e+00,0.0000000000e+00, }, + { 3.1262119724e-03,-7.8390522307e-03,8.5209627801e-02,-4.0804129163e-01,1.1157139955e+00,-1.8767603680e+00,1.8916395224e+00,0.0000000000e+00, }, }; @@ -109,12 +109,12 @@ static inline float filterM(fsk_data *fskd,float in) int i, j; double s; double *pc; - + pc = &coef_in[fskd->f_mark_idx][fskd->bw][0]; fskd->fmxv[(fskd->fmp+6)&7] = in*(*pc++); - + s = (fskd->fmxv[(fskd->fmp + 6) & 7] - fskd->fmxv[fskd->fmp]) + 3 * (fskd->fmxv[(fskd->fmp + 2) & 7] - fskd->fmxv[(fskd->fmp + 4) & 7]); - for (i = 0, j = fskd->fmp; i < 6; i++, j++) + for (i = 0, j = fskd->fmp; i < 6; i++, j++) s += fskd->fmyv[j&7]*(*pc++); fskd->fmyv[j&7] = s; fskd->fmp++; @@ -128,12 +128,12 @@ static inline float filterS(fsk_data *fskd,float in) int i, j; double s; double *pc; - + pc = &coef_in[fskd->f_space_idx][fskd->bw][0]; fskd->fsxv[(fskd->fsp+6)&7] = in*(*pc++); - + s = (fskd->fsxv[(fskd->fsp + 6) & 7] - fskd->fsxv[fskd->fsp]) + 3 * (fskd->fsxv[(fskd->fsp + 2) & 7] - fskd->fsxv[(fskd->fsp + 4) & 7]); - for (i = 0, j = fskd->fsp; i < 6; i++, j++) + for (i = 0, j = fskd->fsp; i < 6; i++, j++) s += fskd->fsyv[j&7]*(*pc++); fskd->fsyv[j&7] = s; fskd->fsp++; @@ -147,15 +147,15 @@ static inline float filterL(fsk_data *fskd,float in) int i, j; double s; double *pc; - + pc = &coef_out[fskd->bw][0]; - fskd->flxv[(fskd->flp + 6) & 7] = in * (*pc++); - + fskd->flxv[(fskd->flp + 6) & 7] = in * (*pc++); + s = (fskd->flxv[fskd->flp] + fskd->flxv[(fskd->flp+6)&7]) + 6 * (fskd->flxv[(fskd->flp+1)&7] + fskd->flxv[(fskd->flp+5)&7]) + 15 * (fskd->flxv[(fskd->flp+2)&7] + fskd->flxv[(fskd->flp+4)&7]) + - 20 * fskd->flxv[(fskd->flp+3)&7]; - + 20 * fskd->flxv[(fskd->flp+3)&7]; + for (i = 0,j = fskd->flp;i<6;i++,j++) s += fskd->flyv[j&7]*(*pc++); fskd->flyv[j&7] = s; @@ -169,14 +169,14 @@ static inline int demodulator(fsk_data *fskd, float *retval, float x) float xS,xM; fskd->cola_in[fskd->pcola] = x; - + xS = filterS(fskd,x); xM = filterM(fskd,x); fskd->cola_filter[fskd->pcola] = xM-xS; x = filterL(fskd,xM*xM - xS*xS); - + fskd->cola_demod[fskd->pcola++] = x; fskd->pcola &= (NCOLA-1); @@ -190,7 +190,7 @@ static int get_bit_raw(fsk_data *fskd, short *buffer, int *len) float x,spb,spb2,ds; int f; - spb = fskd->spb; + spb = fskd->spb; if (fskd->spb == 7) spb = 8000.0 / 1200.0; ds = spb/32.; @@ -257,7 +257,7 @@ int fsk_serial(fsk_data *fskd, short *buffer, int *len, int *outbyte) return -1; samples++; for (;;) { -search_startbit2: +search_startbit2: if (*len <= 0) { fskd->state = STATE_SEARCH_STARTBIT2; return 0; @@ -267,11 +267,11 @@ search_startbit2: return(-1); #if 0 printf("x2 = %5.5f ", fskd->x2); -#endif +#endif if (fskd->x2 < -0.5) - break; + break; } -search_startbit3: +search_startbit3: /* We await for 0.5 bits before using DPLL */ i = fskd->spb/2; if (*len < i) { @@ -280,14 +280,14 @@ search_startbit3: } for (; i>0; i--) { if (demodulator(fskd, &fskd->x1, GET_SAMPLE)) - return(-1); + return(-1); #if 0 printf("x1 = %5.5f ", fskd->x1); -#endif +#endif samples++; } - /* x1 must be negative (start bit confirmation) */ + /* x1 must be negative (start bit confirmation) */ } while (fskd->x1 > 0); fskd->state = STATE_GET_BYTE; @@ -322,7 +322,7 @@ getbyte: /* We read parity bit (if exists) and check parity */ if (fskd->parity) { olen = *len; - i = get_bit_raw(fskd, buffer, len); + i = get_bit_raw(fskd, buffer, len); buffer += (olen - *len); if (i == -1) return(-1); @@ -336,9 +336,9 @@ getbyte: a |= 0x100; /* error */ } } - + /* We read STOP bits. All of them must be 1 */ - + for (j = fskd->nstop;j;j--) { r = get_bit_raw(fskd, buffer, len); if (r == -1) |