Commit 86060536 authored by seren akari's avatar seren akari
Browse files

apply project mf patches

parent d2500c62
......@@ -522,7 +522,7 @@ static struct ast_jb_conf global_jbconf;
 
 
/*! \brief Signaling types that need to use MF detection should be placed in this macro */
#define NEED_MFDETECT(p) (((p)->sig == SIG_FEATDMF) || ((p)->sig == SIG_FEATDMF_TA) || ((p)->sig == SIG_E911) || ((p)->sig == SIG_FGC_CAMA) || ((p)->sig == SIG_FGC_CAMAMF) || ((p)->sig == SIG_FEATB))
#define NEED_MFDETECT(p) (((p)->sig == SIG_FEATDMF) || ((p)->sig == SIG_FEATDMF_TA) || ((p)->sig == SIG_E911) || ((p)->sig == SIG_FGC_CAMA) || ((p)->sig == SIG_FGC_CAMAMF) || ((p)->sig == SIG_FEATB) || ((p)->sig == SIG_SF))
 
static const char tdesc[] = "DAHDI Telephony"
#if defined(HAVE_PRI) || defined(HAVE_SS7) || defined(HAVE_OPENR2)
......@@ -8136,7 +8136,6 @@ winkflashdone:
case SIG_EM:
case SIG_EM_E1:
case SIG_FEATD:
case SIG_SF:
case SIG_SFWINK:
case SIG_SF_FEATD:
case SIG_FXSLS:
......@@ -8174,6 +8173,7 @@ winkflashdone:
case SIG_SF_FEATDMF:
case SIG_SF_FEATB:
case SIG_EMWINK:
case SIG_SF:
/* FGD MF and EMWINK *Must* wait for wink */
if (!ast_strlen_zero(p->dop.dialstr)) {
res = dahdi_dial_str(p, p->dop.op, p->dop.dialstr);
......@@ -8222,7 +8222,6 @@ winkflashdone:
case SIG_FGC_CAMAMF:
case SIG_FEATB:
case SIG_SF_FEATDMF:
case SIG_SF_FEATB:
ast_debug(1, "Got hook complete in MF FGD, waiting for wink now on channel %d\n",p->channel);
break;
default:
......@@ -9579,13 +9578,13 @@ static void *analog_ss_thread(void *data)
case SIG_EMWINK:
case SIG_SF_FEATD:
case SIG_SF_FEATDMF:
case SIG_SF_FEATB:
case SIG_SFWINK:
if (dahdi_wink(p, idx))
goto quit;
/* Fall through */
case SIG_EM:
case SIG_EM_E1:
case SIG_SF_FEATB:
case SIG_SF:
case SIG_FGC_CAMA:
res = tone_zone_play_tone(p->subs[idx].dfd, -1);
......@@ -9652,6 +9651,7 @@ static void *analog_ss_thread(void *data)
break;
case SIG_FEATB:
case SIG_SF_FEATB:
case SIG_SF:
res = my_getsigstr(chan, dtmfbuf + 1, "#", 3000);
if ((res < 1) && (p->dsp)) ast_dsp_digitreset(p->dsp);
break;
......@@ -9780,7 +9780,7 @@ static void *analog_ss_thread(void *data)
} else
ast_log(LOG_WARNING, "Got a non-E911/FGC CAMA input on channel %d. Assuming E&M Wink instead\n", p->channel);
}
if (p->sig == SIG_FEATB) {
if ((p->sig == SIG_FEATB) || (p->sig == SIG_SF_FEATB) || (p->sig == SIG_SF)) {
if (exten[0] == '*') {
char *stringp=NULL;
ast_copy_string(exten2, exten, sizeof(exten2));
......
......@@ -195,9 +195,9 @@ enum gsamp_thresh {
#define DTMF_RELATIVE_PEAK_COL 6.3 /* 8dB */
#define DTMF_TO_TOTAL_ENERGY 42.0
#define BELL_MF_THRESHOLD 1.6e9
#define BELL_MF_TWIST 4.0 /* 6dB */
#define BELL_MF_RELATIVE_PEAK 12.6 /* 11dB */
#define BELL_MF_THRESHOLD 0.001e7
#define BELL_MF_TWIST 60.0 /* 6dB */
#define BELL_MF_RELATIVE_PEAK 3.0 /* 11dB */
#if defined(BUSYDETECT_TONEONLY) && defined(BUSYDETECT_COMPARE_TONE_AND_SILENCE)
#error You cant use BUSYDETECT_TONEONLY together with BUSYDETECT_COMPARE_TONE_AND_SILENCE
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment