Staging: echo: Replace echo_can_state_t with struct echo_can_state
Signed-off-by: Tzafrir Cohen <tzafrir@cohens.org.il> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
68b8d9f6e5
commit
5b97de8c63
2 changed files with 18 additions and 18 deletions
|
@ -128,7 +128,7 @@
|
||||||
|
|
||||||
|
|
||||||
#ifdef __BLACKFIN_ASM__
|
#ifdef __BLACKFIN_ASM__
|
||||||
static void __inline__ lms_adapt_bg(echo_can_state_t *ec, int clean, int shift)
|
static void __inline__ lms_adapt_bg(struct echo_can_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(echo_can_state_t *ec, int clean, int shift)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#else
|
#else
|
||||||
static __inline__ void lms_adapt_bg(echo_can_state_t *ec, int clean, int shift)
|
static __inline__ void lms_adapt_bg(struct echo_can_state *ec, int clean, int shift)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -234,9 +234,9 @@ static __inline__ void lms_adapt_bg(echo_can_state_t *ec, int clean, int shift)
|
||||||
|
|
||||||
/*- End of function --------------------------------------------------------*/
|
/*- End of function --------------------------------------------------------*/
|
||||||
|
|
||||||
echo_can_state_t *echo_can_create(int len, int adaption_mode)
|
struct echo_can_state *echo_can_create(int len, int adaption_mode)
|
||||||
{
|
{
|
||||||
echo_can_state_t *ec;
|
struct echo_can_state *ec;
|
||||||
int i;
|
int i;
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
|
@ -292,7 +292,7 @@ echo_can_state_t *echo_can_create(int len, int adaption_mode)
|
||||||
EXPORT_SYMBOL_GPL(echo_can_create);
|
EXPORT_SYMBOL_GPL(echo_can_create);
|
||||||
/*- End of function --------------------------------------------------------*/
|
/*- End of function --------------------------------------------------------*/
|
||||||
|
|
||||||
void echo_can_free(echo_can_state_t *ec)
|
void echo_can_free(struct echo_can_state *ec)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -306,14 +306,14 @@ void echo_can_free(echo_can_state_t *ec)
|
||||||
EXPORT_SYMBOL_GPL(echo_can_free);
|
EXPORT_SYMBOL_GPL(echo_can_free);
|
||||||
/*- End of function --------------------------------------------------------*/
|
/*- End of function --------------------------------------------------------*/
|
||||||
|
|
||||||
void echo_can_adaption_mode(echo_can_state_t *ec, int adaption_mode)
|
void echo_can_adaption_mode(struct echo_can_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(echo_can_adaption_mode);
|
||||||
/*- End of function --------------------------------------------------------*/
|
/*- End of function --------------------------------------------------------*/
|
||||||
|
|
||||||
void echo_can_flush(echo_can_state_t *ec)
|
void echo_can_flush(struct echo_can_state *ec)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -340,7 +340,7 @@ void echo_can_flush(echo_can_state_t *ec)
|
||||||
EXPORT_SYMBOL_GPL(echo_can_flush);
|
EXPORT_SYMBOL_GPL(echo_can_flush);
|
||||||
/*- End of function --------------------------------------------------------*/
|
/*- End of function --------------------------------------------------------*/
|
||||||
|
|
||||||
void echo_can_snapshot(echo_can_state_t *ec) {
|
void echo_can_snapshot(struct echo_can_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(echo_can_snapshot);
|
||||||
|
@ -348,7 +348,7 @@ EXPORT_SYMBOL_GPL(echo_can_snapshot);
|
||||||
|
|
||||||
/* Dual Path Echo Canceller ------------------------------------------------*/
|
/* Dual Path Echo Canceller ------------------------------------------------*/
|
||||||
|
|
||||||
int16_t echo_can_update(echo_can_state_t *ec, int16_t tx, int16_t rx)
|
int16_t echo_can_update(struct echo_can_state *ec, int16_t tx, int16_t rx)
|
||||||
{
|
{
|
||||||
int32_t echo_value;
|
int32_t echo_value;
|
||||||
int clean_bg;
|
int clean_bg;
|
||||||
|
@ -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(echo_can_state_t *ec, int16_t tx) {
|
int16_t echo_can_hpf_tx(struct echo_can_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) {
|
||||||
|
|
|
@ -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.
|
||||||
*/
|
*/
|
||||||
typedef struct echo_can_state echo_can_state_t;
|
struct echo_can_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.
|
||||||
*/
|
*/
|
||||||
echo_can_state_t *echo_can_create(int len, int adaption_mode);
|
struct echo_can_state *echo_can_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(echo_can_state_t *ec);
|
void echo_can_free(struct echo_can_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(echo_can_state_t *ec);
|
void echo_can_flush(struct echo_can_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(echo_can_state_t *ec, int adaption_mode);
|
void echo_can_adaption_mode(struct echo_can_state *ec, int adaption_mode);
|
||||||
|
|
||||||
void echo_can_snapshot(echo_can_state_t *ec);
|
void echo_can_snapshot(struct echo_can_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(echo_can_state_t *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(echo_can_state_t *ec, int16_t tx, int16_t rx);
|
int16_t echo_can_update(struct echo_can_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(echo_can_state_t *ec, int16_t tx);
|
int16_t echo_can_hpf_tx(struct echo_can_state *ec, int16_t tx);
|
||||||
|
|
||||||
#endif /* __OSLEC_H */
|
#endif /* __OSLEC_H */
|
||||||
|
|
Reference in a new issue