FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xpp: FXO: new CID style -- passthrough

Browse Source 
Adds support for setting a value of 3 to the module parameter
caller_id_style: passthrough - always pass and don't try to emulate
DTMFs.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
This commit is contained in:
Oron Peled 2013-03-14 17:01:32 +02:00 committed by Tzafrir Cohen
parent 949aa4958f
commit 300446b1a1
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/dahdi/xpp/card_fxo.c
View File

@ -45,7 +45,11 @@ static DEF_PARM(uint, poll_metering_interval, 500, 0644,
static DEF_PARM(int, ring_debounce, 50, 0644,
"Number of ticks to debounce a false RING indication");
static DEF_PARM(int, caller_id_style, 0, 0444,
"Caller-Id detection style: 0 - [BELL], 1 - [ETSI_FSK], 2 - [ETSI_DTMF]");
"Caller-Id detection style: "
"0 - [BELL], "
"1 - [ETSI_FSK], "
"2 - [ETSI_DTMF], "
"3 - [PASSTHROUGH]");
static DEF_PARM(int, power_denial_safezone, 650, 0644,
"msec after offhook to ignore power-denial ( (0 - disable power-denial)");
static DEF_PARM(int, power_denial_minlen, 80, 0644,
@ -59,6 +63,8 @@ enum cid_style {
CID_STYLE_BELL = 0, /* E.g: US (Bellcore) */
CID_STYLE_ETSI_FSK = 1, /* E.g: UK (British Telecom) */
CID_STYLE_ETSI_DTMF = 2, /* E.g: DK, Russia */
CID_STYLE_PASSTHROUGH = 3, /* No change: Let asterisk */
/* (>= 1.8) DSP handle this */
};
/* Signaling is opposite (fxs signalling for fxo card) */
@ -393,8 +399,14 @@ static int do_sethook(xpd_t *xpd, int pos, bool to_offhook)
DAA_DIRECT_REQUEST(xbus, xpd, pos, DAA_WRITE, REG_DAA_CONTROL1,
value);
mark_offhook(xpd, pos, to_offhook);
if (caller_id_style != CID_STYLE_ETSI_DTMF)
switch (caller_id_style) {
case CID_STYLE_ETSI_DTMF:
case CID_STYLE_PASSTHROUGH:
break;
default:
oht_pcm(xpd, pos, 0);
break;
}
#ifdef WITH_METERING
priv->metering_count[pos] = 0;
priv->metering_tone_state = 0L;
@ -524,8 +536,12 @@ static int FXO_card_init(xbus_t *xbus, xpd_t *xpd)
priv->battery[i] = BATTERY_UNKNOWN;
/* will be updated on next battery sample */
priv->power[i] = POWER_UNKNOWN;
if (caller_id_style == CID_STYLE_ETSI_DTMF)
switch (caller_id_style) {
case CID_STYLE_ETSI_DTMF:
case CID_STYLE_PASSTHROUGH:
oht_pcm(xpd, i, 1);
break;
}
priv->polarity_last_interval[i] = POLARITY_LAST_INTERVAL_NONE;
}
XPD_DBG(GENERAL, xpd, "done\n");