leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: echo: Changed preffix from echo_can_ to oslec_

Browse Source 
Signed-off-by: Tzafrir Cohen <tzafrir@cohens.org.il>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Tzafrir Cohen 2008-10-12 07:17:26 +02:00 committed by Greg Kroah-Hartman
parent 5b97de8c63
commit 9d8f2d5dfb
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/staging/echo/echo.c
View File

@ -128,7 +128,7 @@
#ifdef __BLACKFIN_ASM__ #ifdef __BLACKFIN_ASM__
static void __inline__ lms_adapt_bg(struct echo_can_state *ec, int clean, int shift) static void __inline__ lms_adapt_bg(struct oslec_state *ec, int clean, int shift)
{ {
int i, j; int i, j;
int offset1; int offset1;
@ -200,7 +200,7 @@ static void __inline__ lms_adapt_bg(struct echo_can_state *ec, int clean, int sh
*/ */
#else #else
static __inline__ void lms_adapt_bg(struct echo_can_state *ec, int clean, int shift) static __inline__ void lms_adapt_bg(struct oslec_state *ec, int clean, int shift)
{ {
int i; int i;
@ -234,9 +234,9 @@ static __inline__ void lms_adapt_bg(struct echo_can_state *ec, int clean, int sh
/*- End of function --------------------------------------------------------*/ /*- End of function --------------------------------------------------------*/
struct echo_can_state *echo_can_create(int len, int adaption_mode) struct oslec_state *oslec_create(int len, int adaption_mode)
{ {
struct echo_can_state *ec; struct oslec_state *ec;
int i; int i;
int j; int j;
@ -273,7 +273,7 @@ struct echo_can_state *echo_can_create(int len, int adaption_mode)
} }
ec->cng_level = 1000; ec->cng_level = 1000;
echo_can_adaption_mode(ec, adaption_mode); oslec_adaption_mode(ec, adaption_mode);
ec->snapshot = (int16_t*)malloc(ec->taps*sizeof(int16_t)); ec->snapshot = (int16_t*)malloc(ec->taps*sizeof(int16_t));
memset(ec->snapshot, 0, sizeof(int16_t)*ec->taps); memset(ec->snapshot, 0, sizeof(int16_t)*ec->taps);
@ -289,10 +289,10 @@ struct echo_can_state *echo_can_create(int len, int adaption_mode)
return ec; return ec;
} }
EXPORT_SYMBOL_GPL(echo_can_create); EXPORT_SYMBOL_GPL(oslec_create);
/*- End of function --------------------------------------------------------*/ /*- End of function --------------------------------------------------------*/
void echo_can_free(struct echo_can_state *ec) void oslec_free(struct oslec_state *ec)
{ {
int i; int i;
@ -303,17 +303,17 @@ void echo_can_free(struct echo_can_state *ec)
kfree(ec->snapshot); kfree(ec->snapshot);
kfree(ec); kfree(ec);
} }
EXPORT_SYMBOL_GPL(echo_can_free); EXPORT_SYMBOL_GPL(oslec_free);
/*- End of function --------------------------------------------------------*/ /*- End of function --------------------------------------------------------*/
void echo_can_adaption_mode(struct echo_can_state *ec, int adaption_mode) void oslec_adaption_mode(struct oslec_state *ec, int adaption_mode)
{ {
ec->adaption_mode = adaption_mode; ec->adaption_mode = adaption_mode;
} }
EXPORT_SYMBOL_GPL(echo_can_adaption_mode); EXPORT_SYMBOL_GPL(oslec_adaption_mode);
/*- End of function --------------------------------------------------------*/ /*- End of function --------------------------------------------------------*/
void echo_can_flush(struct echo_can_state *ec) void oslec_flush(struct oslec_state *ec)
{ {
int i; int i;
@ -337,18 +337,18 @@ void echo_can_flush(struct echo_can_state *ec)
ec->curr_pos = ec->taps - 1; ec->curr_pos = ec->taps - 1;
ec->Pstates = 0; ec->Pstates = 0;
} }
EXPORT_SYMBOL_GPL(echo_can_flush); EXPORT_SYMBOL_GPL(oslec_flush);
/*- End of function --------------------------------------------------------*/ /*- End of function --------------------------------------------------------*/
void echo_can_snapshot(struct echo_can_state *ec) { void oslec_snapshot(struct oslec_state *ec) {
memcpy(ec->snapshot, ec->fir_taps16[0], ec->taps*sizeof(int16_t)); memcpy(ec->snapshot, ec->fir_taps16[0], ec->taps*sizeof(int16_t));
} }
EXPORT_SYMBOL_GPL(echo_can_snapshot); EXPORT_SYMBOL_GPL(oslec_snapshot);
/*- End of function --------------------------------------------------------*/ /*- End of function --------------------------------------------------------*/
/* Dual Path Echo Canceller ------------------------------------------------*/ /* Dual Path Echo Canceller ------------------------------------------------*/
int16_t echo_can_update(struct echo_can_state *ec, int16_t tx, int16_t rx) int16_t oslec_update(struct oslec_state *ec, int16_t tx, int16_t rx)
{ {
int32_t echo_value; int32_t echo_value;
int clean_bg; int clean_bg;
@ -589,7 +589,7 @@ int16_t echo_can_update(struct echo_can_state *ec, int16_t tx, int16_t rx)
return (int16_t) ec->clean_nlp << 1; return (int16_t) ec->clean_nlp << 1;
} }
EXPORT_SYMBOL_GPL(echo_can_update); EXPORT_SYMBOL_GPL(oslec_update);
/*- End of function --------------------------------------------------------*/ /*- End of function --------------------------------------------------------*/
/* This function is seperated from the echo canceller is it is usually called /* This function is seperated from the echo canceller is it is usually called
@ -613,7 +613,7 @@ EXPORT_SYMBOL_GPL(echo_can_update);
precision, which noise shapes things, giving very clean DC removal. precision, which noise shapes things, giving very clean DC removal.
*/ */
int16_t echo_can_hpf_tx(struct echo_can_state *ec, int16_t tx) { int16_t oslec_hpf_tx(struct oslec_state *ec, int16_t tx) {
int tmp, tmp1; int tmp, tmp1;
if (ec->adaption_mode & ECHO_CAN_USE_TX_HPF) { if (ec->adaption_mode & ECHO_CAN_USE_TX_HPF) {
@ -635,7 +635,7 @@ int16_t echo_can_hpf_tx(struct echo_can_state *ec, int16_t tx) {
return tx; return tx;
} }
EXPORT_SYMBOL_GPL(echo_can_hpf_tx); EXPORT_SYMBOL_GPL(oslec_hpf_tx);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("David Rowe"); MODULE_AUTHOR("David Rowe");

2
drivers/staging/echo/echo.h
View File

@ -124,7 +124,7 @@ a minor burden.
G.168 echo canceller descriptor. This defines the working state for a line G.168 echo canceller descriptor. This defines the working state for a line
echo canceller. echo canceller.
*/ */
struct echo_can_state struct oslec_state
{ {
int16_t tx,rx; int16_t tx,rx;
int16_t clean; int16_t clean;

16
drivers/staging/echo/oslec.h
View File

@ -42,31 +42,31 @@
G.168 echo canceller descriptor. This defines the working state for a line G.168 echo canceller descriptor. This defines the working state for a line
echo canceller. echo canceller.
*/ */
struct echo_can_state; struct oslec_state;
/*! Create a voice echo canceller context. /*! Create a voice echo canceller context.
\param len The length of the canceller, in samples. \param len The length of the canceller, in samples.
\return The new canceller context, or NULL if the canceller could not be created. \return The new canceller context, or NULL if the canceller could not be created.
*/ */
struct echo_can_state *echo_can_create(int len, int adaption_mode); struct oslec_state *oslec_create(int len, int adaption_mode);
/*! Free a voice echo canceller context. /*! Free a voice echo canceller context.
\param ec The echo canceller context. \param ec The echo canceller context.
*/ */
void echo_can_free(struct echo_can_state *ec); void oslec_free(struct oslec_state *ec);
/*! Flush (reinitialise) a voice echo canceller context. /*! Flush (reinitialise) a voice echo canceller context.
\param ec The echo canceller context. \param ec The echo canceller context.
*/ */
void echo_can_flush(struct echo_can_state *ec); void oslec_flush(struct oslec_state *ec);
/*! Set the adaption mode of a voice echo canceller context. /*! Set the adaption mode of a voice echo canceller context.
\param ec The echo canceller context. \param ec The echo canceller context.
\param adapt The mode. \param adapt The mode.
*/ */
void echo_can_adaption_mode(struct echo_can_state *ec, int adaption_mode); void oslec_adaption_mode(struct oslec_state *ec, int adaption_mode);
void echo_can_snapshot(struct echo_can_state *ec); void oslec_snapshot(struct oslec_state *ec);
/*! Process a sample through a voice echo canceller. /*! Process a sample through a voice echo canceller.
\param ec The echo canceller context. \param ec The echo canceller context.
@ -74,13 +74,13 @@ void echo_can_snapshot(struct echo_can_state *ec);
\param rx The received audio sample. \param rx The received audio sample.
\return The clean (echo cancelled) received sample. \return The clean (echo cancelled) received sample.
*/ */
int16_t echo_can_update(struct echo_can_state *ec, int16_t tx, int16_t rx); int16_t oslec_update(struct oslec_state *ec, int16_t tx, int16_t rx);
/*! Process to high pass filter the tx signal. /*! Process to high pass filter the tx signal.
\param ec The echo canceller context. \param ec The echo canceller context.
\param tx The transmitted auio sample. \param tx The transmitted auio sample.
\return The HP filtered transmit sample, send this to your D/A. \return The HP filtered transmit sample, send this to your D/A.
*/ */
int16_t echo_can_hpf_tx(struct echo_can_state *ec, int16_t tx); int16_t oslec_hpf_tx(struct oslec_state *ec, int16_t tx);
#endif /* __OSLEC_H */ #endif /* __OSLEC_H */