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

1 files changed, 52 insertions, 52 deletions

diff --git a/main/fskmodem_int.c b/main/fskmodem_int.c
index 8f84f5800..1d46a3a22 100644
--- a/main/fskmodem_int.c
+++ b/main/fskmodem_int.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>
  *
@@ -55,11 +55,11 @@ static inline int iget_sample(short **buffer, int *len)
 
 #define IGET_SAMPLE iget_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,
@@ -74,19 +74,19 @@ static double coef_in[NF][NBW][8]={
 	},  { 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
+	},
 };
 
 /*! Integer Pass Band demodulator filter  */
@@ -95,19 +95,19 @@ static inline int ibpdfilter(struct filter_struct * fs, int in)
 	int i,j;
 	int s;
 	int64_t s_interim;
-	
+
 	/* integer filter */
 	s =  in * fs->icoefs[0];
 	fs->ixv[(fs->ip + 6) & 7] = s;
-	
+
 	s =      (fs->ixv[fs->ip]           + fs->ixv[(fs->ip + 6) & 7]) +
 		6  * (fs->ixv[(fs->ip + 1) & 7] + fs->ixv[(fs->ip + 5) & 7]) +
 		15 * (fs->ixv[(fs->ip + 2) & 7] + fs->ixv[(fs->ip + 4) & 7]) +
 		20 *  fs->ixv[(fs->ip + 3) & 7];
-	
+
 	for (i = 1, j = fs->ip; i < 7; i++, j++) {
 		/* Promote operation to 64 bit to prevent overflow that occurred in 32 bit) */
-		s_interim = (int64_t)(fs->iyv[j & 7]) * 
+		s_interim = (int64_t)(fs->iyv[j & 7]) *
 				(int64_t)(fs->icoefs[i]) /
 				(int64_t)(1024);
 		s += (int) s_interim;
@@ -124,17 +124,17 @@ static inline int ibpfilter(struct filter_struct * fs, int in)
 	int i, j;
 	int s;
 	int64_t s_interim;
-	
+
 	/* integer filter */
 	s =  in * fs->icoefs[0] / 256;
 	fs->ixv[(fs->ip + 6) & 7] = s;
-	
+
 	s = (fs->ixv[(fs->ip + 6) & 7] - fs->ixv[fs->ip])
 		+ 3 * (fs->ixv[(fs->ip + 2) & 7] - fs->ixv[(fs->ip + 4) & 7]);
-	
-	for (i = 1, j = fs->ip; i < 7; i++, j++) { 
-		s_interim = (int64_t)(fs->iyv[j & 7]) * 
-				(int64_t)(fs->icoefs[i]) / 
+
+	for (i = 1, j = fs->ip; i < 7; i++, j++) {
+		s_interim = (int64_t)(fs->iyv[j & 7]) *
+				(int64_t)(fs->icoefs[i]) /
 				(int64_t)(256);
 		s += (int) s_interim;
 	}
@@ -148,14 +148,14 @@ static inline int idemodulator(fsk_data *fskd, int *retval, int x)
 {
 	int is, im, id;
 	int ilin2;
- 
+
 	is = ibpfilter(&fskd->space_filter, x);
 	im = ibpfilter(&fskd->mark_filter, x);
-	
+
 	ilin2 = ((im * im) - (is * is)) / (256 * 256);
-	
+
 	id = ibpdfilter(&fskd->demod_filter, ilin2);
-	
+
 	*retval = id;
 	return 0;
 }
@@ -172,7 +172,7 @@ static int get_bit_raw(fsk_data *fskd, short *buffer, int *len)
 		if ((ix * fskd->xi0) < 0) { /* Transicion */
 			if (!f) {
 				if (fskd->icont < (fskd->pllispb2)) {
-					fskd->icont += fskd->pllids; 
+					fskd->icont += fskd->pllids;
 				} else {
 					fskd->icont -= fskd->pllids;
 				}
@@ -199,17 +199,17 @@ int fskmodem_init(fsk_data *fskd)
 	fskd->demod_filter.ip  = 0;
 
 	for ( i = 0 ; i < 7 ; i++ ) {
-		fskd->space_filter.icoefs[i] = 
+		fskd->space_filter.icoefs[i] =
 			coef_in[fskd->f_space_idx][fskd->bw][i] * 256;
 		fskd->space_filter.ixv[i] = 0;;
 		fskd->space_filter.iyv[i] = 0;;
 
-		fskd->mark_filter.icoefs[i] = 
+		fskd->mark_filter.icoefs[i] =
 			coef_in[fskd->f_mark_idx][fskd->bw][i] * 256;
 		fskd->mark_filter.ixv[i] = 0;;
 		fskd->mark_filter.iyv[i] = 0;;
 
-		fskd->demod_filter.icoefs[i] = 
+		fskd->demod_filter.icoefs[i] =
 			coef_out[fskd->bw][i] * 1024;
 		fskd->demod_filter.ixv[i] = 0;;
 		fskd->demod_filter.iyv[i] = 0;;
@@ -225,7 +225,7 @@ int fsk_serial(fsk_data *fskd, short *buffer, int *len, int *outbyte)
 	int olen;
 	int beginlen = *len;
 	int beginlenx;
-	
+
 	switch (fskd->state) {
 		/* Pick up where we left off */
 	case STATE_SEARCH_STARTBIT2:
@@ -242,10 +242,10 @@ int fsk_serial(fsk_data *fskd, short *buffer, int *len, int *outbyte)
 		just start sending a start bit with nothing preceding it at the beginning
 		of a transmission (what a LOSING design), we cant do it this elegantly */
 		/* NOT USED
-				if (demodulator(zap,&x1)) 
+				if (demodulator(zap,&x1))
 					return -1;
 				for(;;) {
-					if (demodulator(zap,&x2)) 
+					if (demodulator(zap,&x2))
 						return -1;
 					if (x1>0 && x2<0) break;
 					x1=x2;
@@ -260,22 +260,22 @@ 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;
 			}
 			samples++;
-			if (idemodulator(fskd, &fskd->xi2, IGET_SAMPLE)) 
+			if (idemodulator(fskd, &fskd->xi2, IGET_SAMPLE))
 				return -1;
 #if 0
 			printf("xi2 = %d ", fskd->xi2);
-#endif			
+#endif
 			if (fskd->xi2 < 512) {
 				break;
 			}
 		}
-search_startbit3:		   
+search_startbit3:
 		/* We await for 0.5 bits before using DPLL */
 		i = fskd->ispb / 2;
 		if (*len < i) {
@@ -284,11 +284,11 @@ search_startbit3:
 		}
 		for (; i > 0; i--) {
 			if (idemodulator(fskd, &fskd->xi1, IGET_SAMPLE))
-				return(-1); 
+				return(-1);
 #if 0
 			printf("xi1 = %d ", fskd->xi1);
 #endif
-			samples++; 
+			samples++;
 		}
 
 		/* x1 must be negative (start bit confirmation) */
@@ -314,11 +314,11 @@ getbyte:
 		olen = *len;
 		i = get_bit_raw(fskd, buffer, len);
 		buffer += (olen - *len);
-		if (i == -1) 
+		if (i == -1)
 			return -1;
-		if (i) 
+		if (i)
 			n1++;
-		a >>= 1; 
+		a >>= 1;
 		a |= i;
 	}
 	j = 8 - fskd->nbit;
@@ -327,36 +327,36 @@ 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) 
+		if (i == -1)
 			return -1;
-		if (i) 
+		if (i)
 			n1++;
 		if (fskd->parity == 1) {	/* parity=1 (even) */
-			if (n1 & 1) 
+			if (n1 & 1)
 				a |= 0x100;			/* error */
 		} else {					/* parity=2 (odd) */
-			if (!(n1 & 1)) 
+			if (!(n1 & 1))
 				a |= 0x100;			/* error */
 		}
 	}
-	
+
 	/* We read STOP bits. All of them must be 1 */
-	
+
 	for (j = fskd->instop; j; j--) {
 		r = get_bit_raw(fskd, buffer, len);
-		if (r == -1) 
+		if (r == -1)
 			return -1;
-		if (!r) 
+		if (!r)
 			a |= 0x200;
 	}
 
-	/* And finally we return  
-	 * Bit 8 : Parity error 
+	/* And finally we return
+	 * Bit 8 : Parity error
 	 * Bit 9 : Framming error
 	*/
-		
+
 	*outbyte = a;
 	fskd->state = STATE_SEARCH_STARTBIT;
 	return 1;