korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-14 15:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

mISDN: Fix DTMF detection enable/disable

Browse Source 
DTMF detection was enabled when it was not supposed to.

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andreas Eversberg 2009-05-22 11:04:58 +00:00 committed by David S. Miller
parent 8c90e11e35
commit b0579d7459
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/isdn/mISDN/dsp.h
View File

@ -116,6 +116,7 @@ struct dsp_conf {
#define ECHOCAN_BUFF_MASK 0x3ff /* -1 */ #define ECHOCAN_BUFF_MASK 0x3ff /* -1 */
struct dsp_dtmf { struct dsp_dtmf {
int enable; /* dtmf is enabled */
int treshold; /* above this is dtmf (square of) */ int treshold; /* above this is dtmf (square of) */
int software; /* dtmf uses software decoding */ int software; /* dtmf uses software decoding */
int hardware; /* dtmf uses hardware decoding */ int hardware; /* dtmf uses hardware decoding */

2
drivers/isdn/mISDN/dsp_core.c
View File

@ -306,6 +306,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
"to %d\n", *((int *)data)); "to %d\n", *((int *)data));
dsp->dtmf.treshold = (*(int *)data) * 10000; dsp->dtmf.treshold = (*(int *)data) * 10000;
} }
dsp->dtmf.enable = 1;
/* init goertzel */ /* init goertzel */
dsp_dtmf_goertzel_init(dsp); dsp_dtmf_goertzel_init(dsp);
@ -316,6 +317,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
case DTMF_TONE_STOP: /* turn off DTMF */ case DTMF_TONE_STOP: /* turn off DTMF */
if (dsp_debug & DEBUG_DSP_CORE) if (dsp_debug & DEBUG_DSP_CORE)
printk(KERN_DEBUG "%s: stop dtmf\n", __func__); printk(KERN_DEBUG "%s: stop dtmf\n", __func__);
dsp->dtmf.enable = 0;
dsp->dtmf.hardware = 0; dsp->dtmf.hardware = 0;
dsp->dtmf.software = 0; dsp->dtmf.software = 0;
break; break;

3
drivers/isdn/mISDN/dsp_dtmf.c
View File

@ -51,6 +51,9 @@ void dsp_dtmf_hardware(struct dsp *dsp)
{ {
int hardware = 1; int hardware = 1;
if (!dsp->dtmf.enable)
return;
if (!dsp->features.hfc_dtmf) if (!dsp->features.hfc_dtmf)
hardware = 0; hardware = 0;