Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Staging: echo: One variable per line

Browse source 
Our convention is one (statement and) variable per line. Enforce
this in drivers/staging/echo/echo.[ch] .

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jesper Juhl 2012-06-27 22:28:55 +02:00 committed by Greg Kroah-Hartman
parent c01ef023ec
commit 3ec50be588
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/echo/echo.c
View file

@ -118,7 +118,8 @@
#ifdef __bfin__
static inline void lms_adapt_bg(struct oslec_state *ec, int clean, int shift)
{
int i, j;
int i;
int j;
int offset1;
int offset2;
int factor;
@ -335,7 +336,8 @@ int16_t oslec_update(struct oslec_state *ec, int16_t tx, int16_t rx)
{
int32_t echo_value;
int clean_bg;
int tmp, tmp1;
int tmp;
int tmp1;
/*
* Input scaling was found be required to prevent problems when tx
@ -624,7 +626,8 @@ EXPORT_SYMBOL_GPL(oslec_update);
int16_t oslec_hpf_tx(struct oslec_state *ec, int16_t tx)
{
int tmp, tmp1;
int tmp;
int tmp1;
if (ec->adaption_mode & ECHO_CAN_USE_TX_HPF) {
tmp = tx << 15;

28
drivers/staging/echo/echo.h
View file

@ -36,7 +36,6 @@ What does it do?
This module aims to provide G.168-2002 compliant echo cancellation, to remove
electrical echoes (e.g. from 2-4 wire hybrids) from voice calls.
How does it work?
The heart of the echo cancellor is FIR filter. This is adapted to match the
@ -128,7 +127,8 @@ a minor burden.
echo canceller.
*/
struct oslec_state {
int16_t tx, rx;
int16_t tx;
int16_t rx;
int16_t clean;
int16_t clean_nlp;
@ -145,11 +145,18 @@ struct oslec_state {
int16_t shift;
/* Average levels and averaging filter states */
int Ltxacc, Lrxacc, Lcleanacc, Lclean_bgacc;
int Ltx, Lrx;
int Ltxacc;
int Lrxacc;
int Lcleanacc;
int Lclean_bgacc;
int Ltx;
int Lrx;
int Lclean;
int Lclean_bg;
int Lbgn, Lbgn_acc, Lbgn_upper, Lbgn_upper_acc;
int Lbgn;
int Lbgn_acc;
int Lbgn_upper;
int Lbgn_upper_acc;
/* foreground and background filter states */
struct fir16_state_t fir_state;
@ -157,11 +164,16 @@ struct oslec_state {
int16_t *fir_taps16[2];
/* DC blocking filter states */
int tx_1, tx_2, rx_1, rx_2;
int tx_1;
int tx_2;
int rx_1;
int rx_2;
/* optional High Pass Filter states */
int32_t xvtx[5], yvtx[5];
int32_t xvrx[5], yvrx[5];
int32_t xvtx[5];
int32_t yvtx[5];
int32_t xvrx[5];
int32_t yvrx[5];
/* Parameters for the optional Hoth noise generator */
int cng_level;