From: David Yat Sin <dyatsin@sangoma.com>
Date: Fri, 19 Nov 2010 18:58:08 +0000 (-0500)
Subject: Merged from master branch
X-Git-Tag: v1.2-rc1~275^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=995c25051829899f64a6cb495b7913f0d78b2183;p=thirdparty%2Ffreeswitch.git

Merged from master branch
---

995c25051829899f64a6cb495b7913f0d78b2183
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
index 674fea21c5,583d5c1729..56efcb491c
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
@@@ -48,20 -48,15 +48,17 @@@ static ftdm_status_t ftdm_sangoma_isdn_
  ftdm_channel_t* ftdm_sangoma_isdn_process_event_states(ftdm_span_t *span, sngisdn_event_data_t *sngisdn_event);
  static void ftdm_sangoma_isdn_advance_chan_states(ftdm_channel_t *ftdmchan);
  static void ftdm_sangoma_isdn_poll_events(ftdm_span_t *span);
 -
 +static void ftdm_sangoma_isdn_process_phy_events(ftdm_span_t *span, ftdm_oob_event_t event);
  static void ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdmchan);
  static void ftdm_sangoma_isdn_process_stack_event (ftdm_span_t *span, sngisdn_event_data_t *sngisdn_event);
 +static void ftdm_sangoma_isdn_wakeup_phy(ftdm_channel_t *dchan);
 +static void ftdm_sangoma_isdn_dchan_set_queue_size(ftdm_channel_t *ftdmchan);
  
 -static ftdm_io_interface_t		    	g_sngisdn_io_interface;
 -static sng_isdn_event_interface_t		g_sngisdn_event_interface;
 +static ftdm_io_interface_t	    	g_sngisdn_io_interface;
 +static sng_isdn_event_interface_t	g_sngisdn_event_interface;
  
 -ftdm_sngisdn_data_t				g_sngisdn_data;
 +ftdm_sngisdn_data_t 			g_sngisdn_data;
  
- extern ftdm_status_t sngisdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t trace_opt);
- extern ftdm_status_t sngisdn_check_free_ids(void);
- 
  ftdm_state_map_t sangoma_isdn_state_map = {
  	{
  	{
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
index 8208aa14bd,2a65a82985..052fbd4021
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
@@@ -277,10 -275,21 +277,7 @@@ FT_DECLARE(void) clear_call_glare_data(
  
  void stack_hdr_init(Header *hdr);
  void stack_pst_init(Pst *pst);
- FT_DECLARE_INLINE(ftdm_status_t) get_ftdmchan_by_spInstId(int16_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data);
- FT_DECLARE_INLINE(ftdm_status_t) get_ftdmchan_by_suInstId(int16_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data);
- FT_DECLARE_INLINE(ftdm_status_t) sngisdn_set_avail_rate(ftdm_span_t *ftdmspan, sngisdn_avail_t avail);
  
 -FT_DECLARE(ftdm_status_t) get_ftdmchan_by_spInstId(int16_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data);
 -FT_DECLARE(ftdm_status_t) get_ftdmchan_by_suInstId(int16_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data);
 -FT_DECLARE(ftdm_status_t) sng_isdn_set_avail_rate(ftdm_span_t *ftdmspan, sngisdn_avail_t avail);
 -
 -FT_DECLARE(ftdm_status_t) cpy_calling_num_from_stack(ftdm_caller_data_t *ftdm, CgPtyNmb *cgPtyNmb);
 -FT_DECLARE(ftdm_status_t) cpy_called_num_from_stack(ftdm_caller_data_t *ftdm, CdPtyNmb *cdPtyNmb);
 -FT_DECLARE(ftdm_status_t) cpy_redir_num_from_stack(ftdm_caller_data_t *ftdm, RedirNmb *redirNmb);
 -FT_DECLARE(ftdm_status_t) cpy_calling_name_from_stack(ftdm_caller_data_t *ftdm, Display *display);
 -
 -FT_DECLARE(ftdm_status_t) cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_data_t *ftdm);
 -FT_DECLARE(ftdm_status_t) cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *ftdm);
 -FT_DECLARE(ftdm_status_t) cpy_redir_num_from_user(RedirNmb *redirNmb, ftdm_caller_data_t *ftdm);
 -FT_DECLARE(ftdm_status_t) cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_channel_t *ftdmchan);
 -
  /* Outbound Call Control functions */
  void sngisdn_snd_setup(ftdm_channel_t *ftdmchan);
  void sngisdn_snd_setup_ack(ftdm_channel_t *ftdmchan);
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
index b0848379e9,cb508a54b4..2853335efc
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
@@@ -34,12 -34,13 +34,6 @@@
  
  #include "ftmod_sangoma_isdn.h"
  
- extern ftdm_status_t cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_data_t *ftdm);
- extern ftdm_status_t cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *ftdm);
- extern ftdm_status_t cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_channel_t *ftdmchan);
- extern ftdm_status_t cpy_redir_num_from_user(RedirNmb *redirNmb, ftdm_caller_data_t *ftdm);
- 
 -void sngisdn_snd_setup(ftdm_channel_t *ftdmchan);
 -void sngisdn_snd_proceed(ftdm_channel_t *ftdmchan);
 -void sngisdn_snd_progress(ftdm_channel_t *ftdmchan);
 -void sngisdn_snd_connect(ftdm_channel_t *ftdmchan);
 -void sngisdn_snd_disconnect(ftdm_channel_t *ftdmchan);
 -void sngisdn_snd_release(ftdm_channel_t *ftdmchan, uint8_t glare);
--
  void sngisdn_snd_setup(ftdm_channel_t *ftdmchan)
  {
  	ConEvnt conEvnt;
diff --cc libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
index f9fbb5c044,8e8acc24e3..eb42207138
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
@@@ -115,11 -115,11 +115,11 @@@ FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_ne
  static __inline__ int tdmv_api_wait_socket(ftdm_channel_t *ftdmchan, int timeout, int *flags)
  {
  	
 -#ifdef LIBSANGOMA_VERSION
 +#ifdef LIBSANGOMA_VERSION	
  	int err;
-     uint32_t inflags = *flags;
-     uint32_t outflags = 0;
- 	sangoma_wait_obj_t *sangoma_wait_obj = ftdmchan->mod_data;
+ 	uint32_t inflags = *flags;
+ 	uint32_t outflags = 0;
+ 	sangoma_wait_obj_t *sangoma_wait_obj = ftdmchan->io_data;
  
  	err = sangoma_waitfor(sangoma_wait_obj, inflags, &outflags, timeout);
  	*flags = 0;