Skip to content

Commit

Permalink
Staging: echo: Changed preffix from echo_can_ to oslec_
Browse files Browse the repository at this point in the history 
Signed-off-by: Tzafrir Cohen <tzafrir@cohens.org.il>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Tzafrir Cohen authored and Greg Kroah-Hartman committed Oct 22, 2008
1 parent 5b97de8 commit 9d8f2d5
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
36 changes: 18 additions & 18 deletions drivers/staging/echo/echo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@


#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 offset1;
Expand Down Expand Up @@ -200,7 +200,7 @@ static void __inline__ lms_adapt_bg(struct echo_can_state *ec, int clean, int sh
*/

#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;

Expand Down Expand Up @@ -234,9 +234,9 @@ static __inline__ void lms_adapt_bg(struct echo_can_state *ec, int clean, int sh

/*- 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 j;

Expand Down Expand Up @@ -273,7 +273,7 @@ struct echo_can_state *echo_can_create(int len, int adaption_mode)
}

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));
memset(ec->snapshot, 0, sizeof(int16_t)*ec->taps);
Expand All @@ -289,10 +289,10 @@ struct echo_can_state *echo_can_create(int len, int adaption_mode)

return ec;
}
EXPORT_SYMBOL_GPL(echo_can_create);
EXPORT_SYMBOL_GPL(oslec_create);
/*- End of function --------------------------------------------------------*/

void echo_can_free(struct echo_can_state *ec)
void oslec_free(struct oslec_state *ec)
{
int i;

Expand All @@ -303,17 +303,17 @@ void echo_can_free(struct echo_can_state *ec)
kfree(ec->snapshot);
kfree(ec);
}
EXPORT_SYMBOL_GPL(echo_can_free);
EXPORT_SYMBOL_GPL(oslec_free);
/*- 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;
}
EXPORT_SYMBOL_GPL(echo_can_adaption_mode);
EXPORT_SYMBOL_GPL(oslec_adaption_mode);
/*- End of function --------------------------------------------------------*/

void echo_can_flush(struct echo_can_state *ec)
void oslec_flush(struct oslec_state *ec)
{
int i;

Expand All @@ -337,18 +337,18 @@ void echo_can_flush(struct echo_can_state *ec)
ec->curr_pos = ec->taps - 1;
ec->Pstates = 0;
}
EXPORT_SYMBOL_GPL(echo_can_flush);
EXPORT_SYMBOL_GPL(oslec_flush);
/*- 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));
}
EXPORT_SYMBOL_GPL(echo_can_snapshot);
EXPORT_SYMBOL_GPL(oslec_snapshot);
/*- End of function --------------------------------------------------------*/

/* 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;
int clean_bg;
Expand Down Expand Up @@ -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;
}
EXPORT_SYMBOL_GPL(echo_can_update);
EXPORT_SYMBOL_GPL(oslec_update);
/*- End of function --------------------------------------------------------*/

/* This function is seperated from the echo canceller is it is usually called
Expand All @@ -613,7 +613,7 @@ EXPORT_SYMBOL_GPL(echo_can_update);
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;

if (ec->adaption_mode & ECHO_CAN_USE_TX_HPF) {
Expand All @@ -635,7 +635,7 @@ int16_t echo_can_hpf_tx(struct echo_can_state *ec, int16_t tx) {

return tx;
}
EXPORT_SYMBOL_GPL(echo_can_hpf_tx);
EXPORT_SYMBOL_GPL(oslec_hpf_tx);

MODULE_LICENSE("GPL");
MODULE_AUTHOR("David Rowe");
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/echo/echo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ a minor burden.
G.168 echo canceller descriptor. This defines the working state for a line
echo canceller.
*/
struct echo_can_state
struct oslec_state
{
int16_t tx,rx;
int16_t clean;
Expand Down
16 changes: 8 additions & 8 deletions drivers/staging/echo/oslec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,45 +42,45 @@
G.168 echo canceller descriptor. This defines the working state for a line
echo canceller.
*/
struct echo_can_state;
struct oslec_state;

/*! Create a voice echo canceller context.
\param len The length of the canceller, in samples.
\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.
\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.
\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.
\param ec The echo canceller context.
\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.
\param ec The echo canceller context.
\param tx The transmitted audio sample.
\param rx The received audio 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.
\param ec The echo canceller context.
\param tx The transmitted auio sample.
\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 */

0 comments on commit 9d8f2d5

Please sign in to comment.