diff options
| -rw-r--r-- | channels/chan_zap.c | 4 | ||||
| -rwxr-xr-x | configure | 73 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 6 |
4 files changed, 85 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index ede7af23e..231cd6fbd 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -11683,6 +11683,7 @@ static char *zap_show_version(struct ast_cli_entry *e, int cmd, struct ast_cli_a return CLI_SUCCESS; } +#ifdef HAVE_ZAPTEL_HWGAIN static char *zap_set_hwgain(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { int channel; @@ -11753,6 +11754,7 @@ static char *zap_set_hwgain(struct ast_cli_entry *e, int cmd, struct ast_cli_arg return CLI_FAILURE; } +#endif static char *zap_set_swgain(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { @@ -11836,7 +11838,9 @@ static struct ast_cli_entry zap_cli[] = { AST_CLI_DEFINE(zap_restart_cmd, "Fully restart zaptel channels"), AST_CLI_DEFINE(zap_show_status, "Show all Zaptel cards status"), AST_CLI_DEFINE(zap_show_version, "Show the Zaptel version in use"), +#ifdef HAVE_ZAPTEL_HWGAIN AST_CLI_DEFINE(zap_set_hwgain, "Set hardware gains at the port driver"), +#endif AST_CLI_DEFINE(zap_set_swgain, "Set software gain table values"), }; @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 89506 . +# From configure.ac Revision: 89615 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -43640,6 +43640,77 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +# Check for Zaptel hwgain support + + if test "x${PBX_ZAPTEL_HWGAIN}" != "x1" -a "${USE_ZAPTEL_HWGAIN}" != "no"; then + { echo "$as_me:$LINENO: checking for ZT_SET_HWGAIN in zaptel/zaptel.h" >&5 +echo $ECHO_N "checking for ZT_SET_HWGAIN in zaptel/zaptel.h... $ECHO_C" >&6; } + saved_cppflags="${CPPFLAGS}" + if test "x${ZAPTEL_HWGAIN_DIR}" != "x"; then + ZAPTEL_HWGAIN_INCLUDE="-I${ZAPTEL_HWGAIN_DIR}/include" + fi + CPPFLAGS="${CPPFLAGS} ${ZAPTEL_HWGAIN_INCLUDE}" + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <zaptel/zaptel.h> +int +main () +{ +int foo = ZT_SET_HWGAIN; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + PBX_ZAPTEL_HWGAIN=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ZAPTEL_HWGAIN 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ZAPTEL_HWGAIN_VERSION +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="${saved_cppflags}" + fi + + # On FreeBSD, try old zaptel (0.80 or so) and pretend we have vldtmf case "${host_os}" in freebsd*) diff --git a/configure.ac b/configure.ac index 4c40c17f9..b7bbfbf5f 100644 --- a/configure.ac +++ b/configure.ac @@ -1140,6 +1140,9 @@ AST_C_DEFINE_CHECK([ZAPTEL_VLDTMF], [ZT_EVENT_REMOVED], [zaptel/zaptel.h]) # Check for transcode support AST_C_DEFINE_CHECK([ZAPTEL_TRANSCODE], [ZT_TCOP_ALLOCATE], [zaptel/zaptel.h]) +# Check for Zaptel hwgain support +AST_C_DEFINE_CHECK([ZAPTEL_HWGAIN], [ZT_SET_HWGAIN], [zaptel/zaptel.h]) + # On FreeBSD, try old zaptel (0.80 or so) and pretend we have vldtmf case "${host_os}" in freebsd*) diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 4904260f3..432668bc2 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -997,6 +997,12 @@ /* Define this to indicate the ${ZAPTEL_DESCRIP} library */ #undef HAVE_ZAPTEL +/* Define if your system has the ZAPTEL_HWGAIN headers. */ +#undef HAVE_ZAPTEL_HWGAIN + +/* Define ZAPTEL_HWGAIN headers version */ +#undef HAVE_ZAPTEL_HWGAIN_VERSION + /* Define if your system has the ZAPTEL_TRANSCODE headers. */ #undef HAVE_ZAPTEL_TRANSCODE |