From ff935bb1d95d3a27343aa3798dbe50607731e09b Mon Sep 17 00:00:00 2001 From: Moises Silva Date: Sun, 13 Jul 2014 02:19:09 -0400 Subject: [PATCH] Revert "freetdm: ftmod_wanpipe: Do not attempt to initialize hwdtmf in GSM ports during shutdown" This reverts commit b29a41bb1bf104113596c2f28a6cf255a1119c64. This commit is no longer needed now that proper infrastructure has been added to allow signaling modules to generate and detect DTMF The feature macros should only be used for I/O module features and not for signaling module features --- libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c index 3d2a23ceef..ca60e30352 100755 --- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c +++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c @@ -1721,8 +1721,8 @@ static FIO_CHANNEL_DESTROY_FUNCTION(wanpipe_channel_destroy) /* enable HW DTMF. As odd as it seems. Why enable when the channel is being destroyed and won't be used anymore? * because that way we can transfer the DTMF state back to the driver, if we're being restarted we will set again * the FEATURE_DTMF flag and use HW DTMF, if we don't enable here, then on module restart we won't see - * HW DTMF available and will use software (except for GSM cards which enable hw dtmf on the signaling module) */ - if (ftdmchan->span->trunk_type != FTDM_TRUNK_GSM && ftdm_channel_test_feature(ftdmchan, FTDM_CHANNEL_FEATURE_DTMF_DETECT)) { + * HW DTMF available and will use software */ + if (ftdm_channel_test_feature(ftdmchan, FTDM_CHANNEL_FEATURE_DTMF_DETECT)) { wanpipe_tdm_api_t tdm_api; int err; memset(&tdm_api, 0, sizeof(tdm_api));