Commit 26f61c0d authored by Markus Elfring's avatar Markus Elfring Committed by Mauro Carvalho Chehab

[media] cx88-dsp: Add some spaces for better code readability

Use space characters at some source code places according to
the Linux coding style convention.
Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 045d69ce
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define INT_PI ((s32)(3.141592653589 * 32768.0)) #define INT_PI ((s32)(3.141592653589 * 32768.0))
#define compat_remainder(a, b) \ #define compat_remainder(a, b) \
((float)(((s32)((a)*100))%((s32)((b)*100)))/100.0) ((float)(((s32)((a) * 100)) % ((s32)((b) * 100))) / 100.0)
#define baseband_freq(carrier, srate, tone) ((s32)( \ #define baseband_freq(carrier, srate, tone) ((s32)( \
(compat_remainder(carrier + tone, srate)) / srate * 2 * INT_PI)) (compat_remainder(carrier + tone, srate)) / srate * 2 * INT_PI))
...@@ -82,15 +82,15 @@ static s32 int_cos(u32 x) ...@@ -82,15 +82,15 @@ static s32 int_cos(u32 x)
if (period % 2) if (period % 2)
return -int_cos(x - INT_PI); return -int_cos(x - INT_PI);
x = x % INT_PI; x = x % INT_PI;
if (x > INT_PI/2) if (x > INT_PI / 2)
return -int_cos(INT_PI/2 - (x % (INT_PI/2))); return -int_cos(INT_PI / 2 - (x % (INT_PI / 2)));
/* Now x is between 0 and INT_PI/2. /* Now x is between 0 and INT_PI/2.
* To calculate cos(x) we use it's Taylor polinom. */ * To calculate cos(x) we use it's Taylor polinom. */
t2 = x*x/32768/2; t2 = x * x / 32768 / 2;
t4 = t2*x/32768*x/32768/3/4; t4 = t2 * x / 32768 * x / 32768 / 3 / 4;
t6 = t4*x/32768*x/32768/5/6; t6 = t4 * x / 32768 * x / 32768 / 5 / 6;
t8 = t6*x/32768*x/32768/7/8; t8 = t6 * x / 32768 * x / 32768 / 7 / 8;
ret = 32768-t2+t4-t6+t8; ret = 32768 - t2 + t4 - t6 + t8;
return ret; return ret;
} }
...@@ -100,14 +100,14 @@ static u32 int_goertzel(s16 x[], u32 N, u32 freq) ...@@ -100,14 +100,14 @@ static u32 int_goertzel(s16 x[], u32 N, u32 freq)
* given frequency in the signal */ * given frequency in the signal */
s32 s_prev = 0; s32 s_prev = 0;
s32 s_prev2 = 0; s32 s_prev2 = 0;
s32 coeff = 2*int_cos(freq); s32 coeff = 2 * int_cos(freq);
u32 i; u32 i;
u64 tmp; u64 tmp;
u32 divisor; u32 divisor;
for (i = 0; i < N; i++) { for (i = 0; i < N; i++) {
s32 s = x[i] + ((s64)coeff*s_prev/32768) - s_prev2; s32 s = x[i] + ((s64)coeff * s_prev / 32768) - s_prev2;
s_prev2 = s_prev; s_prev2 = s_prev;
s_prev = s; s_prev = s;
} }
...@@ -138,7 +138,7 @@ static u32 noise_magnitude(s16 x[], u32 N, u32 freq_start, u32 freq_end) ...@@ -138,7 +138,7 @@ static u32 noise_magnitude(s16 x[], u32 N, u32 freq_start, u32 freq_end)
if (N > 192) { if (N > 192) {
/* The last 192 samples are enough for noise detection */ /* The last 192 samples are enough for noise detection */
x += (N-192); x += (N - 192);
N = 192; N = 192;
} }
...@@ -196,8 +196,8 @@ static s32 detect_a2_a2m_eiaj(struct cx88_core *core, s16 x[], u32 N) ...@@ -196,8 +196,8 @@ static s32 detect_a2_a2m_eiaj(struct cx88_core *core, s16 x[], u32 N)
if (core->tvaudio == WW_EIAJ) { if (core->tvaudio == WW_EIAJ) {
/* EIAJ checks may need adjustments */ /* EIAJ checks may need adjustments */
if ((carrier > max(stereo, dual)*2) && if ((carrier > max(stereo, dual) * 2) &&
(carrier < max(stereo, dual)*6) && (carrier < max(stereo, dual) * 6) &&
(carrier > 20 && carrier < 200) && (carrier > 20 && carrier < 200) &&
(max(stereo, dual) > min(stereo, dual))) { (max(stereo, dual) > min(stereo, dual))) {
/* For EIAJ the carrier is always present, /* For EIAJ the carrier is always present,
...@@ -205,11 +205,11 @@ static s32 detect_a2_a2m_eiaj(struct cx88_core *core, s16 x[], u32 N) ...@@ -205,11 +205,11 @@ static s32 detect_a2_a2m_eiaj(struct cx88_core *core, s16 x[], u32 N)
return ret; return ret;
} }
} else { } else {
if ((carrier > max(stereo, dual)*2) && if ((carrier > max(stereo, dual) * 2) &&
(carrier < max(stereo, dual)*8) && (carrier < max(stereo, dual) * 8) &&
(carrier > 20 && carrier < 200) && (carrier > 20 && carrier < 200) &&
(noise < 10) && (noise < 10) &&
(max(stereo, dual) > min(stereo, dual)*2)) { (max(stereo, dual) > min(stereo, dual) * 2)) {
return ret; return ret;
} }
} }
...@@ -234,9 +234,9 @@ static s16 *read_rds_samples(struct cx88_core *core, u32 *N) ...@@ -234,9 +234,9 @@ static s16 *read_rds_samples(struct cx88_core *core, u32 *N)
s16 *samples; s16 *samples;
unsigned int i; unsigned int i;
unsigned int bpl = srch->fifo_size/AUD_RDS_LINES; unsigned int bpl = srch->fifo_size / AUD_RDS_LINES;
unsigned int spl = bpl/4; unsigned int spl = bpl / 4;
unsigned int sample_count = spl*(AUD_RDS_LINES-1); unsigned int sample_count = spl * (AUD_RDS_LINES - 1);
u32 current_address = cx_read(srch->ptr1_reg); u32 current_address = cx_read(srch->ptr1_reg);
u32 offset = (current_address - srch->fifo_start + bpl); u32 offset = (current_address - srch->fifo_start + bpl);
...@@ -252,7 +252,7 @@ static s16 *read_rds_samples(struct cx88_core *core, u32 *N) ...@@ -252,7 +252,7 @@ static s16 *read_rds_samples(struct cx88_core *core, u32 *N)
*N = sample_count; *N = sample_count;
for (i = 0; i < sample_count; i++) { for (i = 0; i < sample_count; i++) {
offset = offset % (AUD_RDS_LINES*bpl); offset = offset % (AUD_RDS_LINES * bpl);
samples[i] = cx_read(srch->fifo_start + offset); samples[i] = cx_read(srch->fifo_start + offset);
offset += 4; offset += 4;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment