temporarily remove some libsangoma APIs from ozmod_wanpipe until the Windows driver release is fixed

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@1056 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Moises Silva 2010-03-11 16:58:36 +00:00
parent d6fcb65606
commit 6c8caec2e4

View File

@ -43,6 +43,8 @@
#include "libsangoma.h" #include "libsangoma.h"
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
/* remove this when http://jira.freeswitch.org/browse/FSBUILD-259 wanpipe issue is fixed */
#define WINDOWS_BUILD_BROKEN 1
/*! Backward compatible defines - current code is all using the old names*/ /*! Backward compatible defines - current code is all using the old names*/
#define sangoma_open_tdmapi_span_chan sangoma_open_api_span_chan #define sangoma_open_tdmapi_span_chan sangoma_open_api_span_chan
#define sangoma_open_tdmapi_span sangoma_open_api_span #define sangoma_open_tdmapi_span sangoma_open_api_span
@ -585,24 +587,29 @@ static ZIO_COMMAND_FUNCTION(wanpipe_command)
break; break;
case ZAP_COMMAND_ENABLE_ECHOCANCEL: case ZAP_COMMAND_ENABLE_ECHOCANCEL:
{ {
#ifndef WINDOWS_BUILD_BROKEN
err=sangoma_tdm_enable_hwec(zchan->sockfd, &tdm_api); err=sangoma_tdm_enable_hwec(zchan->sockfd, &tdm_api);
if (err) { if (err) {
snprintf(zchan->last_error, sizeof(zchan->last_error), "HWEC Enable Failed"); snprintf(zchan->last_error, sizeof(zchan->last_error), "HWEC Enable Failed");
return ZAP_FAIL; return ZAP_FAIL;
} }
#endif /* WINDOWS_BUILD_BROKEN */
} }
break; break;
case ZAP_COMMAND_DISABLE_ECHOCANCEL: case ZAP_COMMAND_DISABLE_ECHOCANCEL:
{ {
#ifndef WINDOWS_BUILD_BROKEN
err=sangoma_tdm_disable_hwec(zchan->sockfd, &tdm_api); err=sangoma_tdm_disable_hwec(zchan->sockfd, &tdm_api);
if (err) { if (err) {
snprintf(zchan->last_error, sizeof(zchan->last_error), "HWEC Disable Failed"); snprintf(zchan->last_error, sizeof(zchan->last_error), "HWEC Disable Failed");
return ZAP_FAIL; return ZAP_FAIL;
} }
#endif /* WINDOWS_BUILD_BROKEN */
} }
break; break;
case ZAP_COMMAND_ENABLE_LOOP: case ZAP_COMMAND_ENABLE_LOOP:
{ {
#ifndef WINDOWS_BUILD_BROKEN
#ifdef WP_API_FEATURE_LOOP #ifdef WP_API_FEATURE_LOOP
err=sangoma_tdm_enable_loop(zchan->sockfd, &tdm_api); err=sangoma_tdm_enable_loop(zchan->sockfd, &tdm_api);
if (err) { if (err) {
@ -610,9 +617,11 @@ static ZIO_COMMAND_FUNCTION(wanpipe_command)
return ZAP_FAIL; return ZAP_FAIL;
} }
#endif #endif
#endif /* WINDOWS_BUILD_BROKEN */
} }
case ZAP_COMMAND_DISABLE_LOOP: case ZAP_COMMAND_DISABLE_LOOP:
{ {
#ifndef WINDOWS_BUILD_BROKEN
#ifdef WP_API_FEATURE_LOOP #ifdef WP_API_FEATURE_LOOP
err=sangoma_tdm_disable_loop(zchan->sockfd, &tdm_api); err=sangoma_tdm_disable_loop(zchan->sockfd, &tdm_api);
if (err) { if (err) {
@ -620,6 +629,7 @@ static ZIO_COMMAND_FUNCTION(wanpipe_command)
return ZAP_FAIL; return ZAP_FAIL;
} }
#endif #endif
#endif /* WINDOWS_BUILD_BROKEN */
} }
case ZAP_COMMAND_SET_INTERVAL: case ZAP_COMMAND_SET_INTERVAL:
{ {
@ -1102,15 +1112,17 @@ ZIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event)
} }
break; break;
case WP_TDMAPI_EVENT_ALARM: case WP_TDMAPI_EVENT_ALARM:
zap_log(ZAP_LOG_DEBUG, "Got wanpipe alarms %d\n", tdm_api.wp_tdm_cmd.event.wp_api_event_alarm); {
zap_sigmsg_t sigmsg; zap_sigmsg_t sigmsg;
memset(&sigmsg, 0, sizeof(sigmsg)); zap_log(ZAP_LOG_DEBUG, "Got wanpipe alarms %d\n", tdm_api.wp_tdm_cmd.event.wp_api_event_alarm);
event_id = ZAP_OOB_ALARM_TRAP; memset(&sigmsg, 0, sizeof(sigmsg));
sigmsg.chan_id = zchan->chan_id; event_id = ZAP_OOB_ALARM_TRAP;
sigmsg.span_id = zchan->span_id; sigmsg.chan_id = zchan->chan_id;
sigmsg.channel = zchan; sigmsg.span_id = zchan->span_id;
sigmsg.event_id = (event_id == ZAP_OOB_ALARM_CLEAR) ? ZAP_SIGEVENT_ALARM_CLEAR : ZAP_SIGEVENT_ALARM_TRAP; sigmsg.channel = zchan;
zap_span_send_signal(zchan->span, &sigmsg); sigmsg.event_id = (event_id == ZAP_OOB_ALARM_CLEAR) ? ZAP_SIGEVENT_ALARM_CLEAR : ZAP_SIGEVENT_ALARM_TRAP;
zap_span_send_signal(zchan->span, &sigmsg);
}
break; break;
default: default:
{ {