retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Compile with the new HWEC API if wanec_iface_api.h file is present. 

git-svn-id: http://voip.null.ro/svn/yate@2359 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2008-11-24 12:04:03 +00:00
parent ee2c073468
commit 7ac8647e3a
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@ -399,6 +399,9 @@ if [[ "x$ac_cv_use_wphwec" != "xno" ]]; then
AC_MSG_CHECKING([for Wanpipe/Octasic headers])
if [[ -f "$ac_cv_use_wphwec/wanec_iface.h" -a -f "$ac_cv_use_wphwec/oct6100_api/oct6100api/oct6100_api.h" ]]; then
WANPIPE_HWEC_INC="-DHAVE_WANPIPE_HWEC -I$ac_cv_use_wphwec -I$ac_cv_use_wphwec/oct6100_api"
if [[ -f "$ac_cv_use_wphwec/wanec_iface_api.h" ]]; then
WANPIPE_HWEC_INC="-DHAVE_WANPIPE_HWEC_API $WANPIPE_HWEC_INC"
fi
ac_cv_use_wphwec=yes
else
ac_cv_use_wphwec=no

14
modules/server/wpcard.cpp
View File

@ -41,12 +41,20 @@ extern "C" {
#include <linux/sdla_aft_te1.h>
#ifdef HAVE_WANPIPE_HWEC
#include <wanec_iface.h>
#ifdef HAVE_WANPIPE_HWEC_API
#include <wanec_iface_api.h>
#define WAN_EC_CMD_DTMF_ENABLE WAN_EC_API_CMD_DTMF_ENABLE
#define WAN_EC_CMD_DTMF_DISABLE WAN_EC_API_CMD_DTMF_DISABLE
#endif
#ifndef WANEC_DEV_DIR
#warning Incompatible echo canceller API, upgrade or configure --without-wphwec
#undef HAVE_WANPIPE_HWEC
#endif // WANEC_DEV_DIR
#endif
#endif // HAVE_WANPIPE_HWEC
};
@ -562,8 +570,8 @@ bool WpSocket::dtmfDetect(bool enable)
#ifdef HAVE_WANPIPE_HWEC
api_tx_hdr_t a;
::memset(&a,0,sizeof(api_tx_hdr_t));
a.u.event.type = WP_API_EVENT_DTMF;
a.u.event.mode = enable ? WP_API_EVENT_ENABLE : WP_API_EVENT_DISABLE;
a.wp_api_tx_hdr_event_type = WP_API_EVENT_DTMF;
a.wp_api_tx_hdr_event_mode = enable ? WP_API_EVENT_ENABLE : WP_API_EVENT_DISABLE;
ok = (::ioctl(m_socket.handle(),SIOC_WANPIPE_API,&a) >= 0);
#else
// pretend enabling fails, disabling succeeds