From: David Yat Sin <dyatsin@sangoma.com>
Date: Thu, 11 Nov 2010 00:22:27 +0000 (-0500)
Subject: Merge branch 'master' into netborder
X-Git-Tag: v1.2-rc1~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=086c397cdc920b67382c3c35be3d9c10c4ff0fd3;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into netborder

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
	libs/freetdm/src/include/private/ftdm_core.h
---

086c397cdc920b67382c3c35be3d9c10c4ff0fd3
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
index 04c3b86c5e,39231a0f39..69743115fe
--- 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,8 -48,7 +48,7 @@@ 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);
  
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
index d8e6c8e00d,bfc00d07ba..1714ac185c
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
@@@ -113,7 -113,41 +113,41 @@@ ftdm_status_t sngisdn_stack_stop(ftdm_s
  }
  
  
 -ftdm_status_t sng_isdn_wake_up_phy(ftdm_span_t *span)
++ftdm_status_t sngisdn_wake_up_phy(ftdm_span_t *span)
+ {
+ 	L1Mngmt cntrl;
+ 	Pst pst;
+ 
+ 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
+ 
+ 	/* initalize the post structure */
+ 	stack_pst_init(&pst);
+ 
+ 	/* insert the destination Entity */
+ 	pst.dstEnt = ENTL1;
+ 
+ 	/* initalize the control structure */
+ 	memset(&cntrl, 0, sizeof(cntrl));
+ 
+ 	/* initalize the control header */
+ 	stack_hdr_init(&cntrl.hdr);
+ 
+ 	cntrl.hdr.msgType = TCNTRL;			/* configuration */
+ 	cntrl.hdr.entId.ent = ENTL1;		/* entity */
+ 	cntrl.hdr.entId.inst = S_INST;		/* instance */
+ 	cntrl.hdr.elmId.elmnt = STTSAP;		/* SAP Specific cntrl */
+ 
+ 	cntrl.t.cntrl.action = AENA;
+ 	cntrl.t.cntrl.subAction = SAELMNT;
+ 	cntrl.t.cntrl.sapId = signal_data->link_id;
+ 	
+ 	if (sng_isdn_phy_cntrl(&pst, &cntrl)) {
+ 		return FTDM_FAIL;
+ 	}
+ 	return FTDM_SUCCESS;
+ }
+ 
 -ftdm_status_t sng_isdn_activate_phy(ftdm_span_t *span)
 +ftdm_status_t sngisdn_activate_phy(ftdm_span_t *span)
  {
  
  	/* There is no need to start phy, as it will Q921 will send a activate request to phy when it starts */
diff --cc libs/freetdm/src/include/private/ftdm_core.h
index 239eb4a3d9,dbf108020b..c5f3c4b821
--- a/libs/freetdm/src/include/private/ftdm_core.h
+++ b/libs/freetdm/src/include/private/ftdm_core.h
@@@ -222,8 -222,8 +222,7 @@@ extern "C" 
  
  #define ftdm_is_dtmf(key)  ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119)
  
 -#define FTDM_SPAN_IS_BRI(x)     ((x)->trunk_type == FTDM_TRUNK_BRI || (x)->trunk_type == FTDM_TRUNK_BRI_PTMP)
 -
 +#define FTDM_SPAN_IS_BRI(x)	((x)->trunk_type == FTDM_TRUNK_BRI || (x)->trunk_type == FTDM_TRUNK_BRI_PTMP)
- 	
  /*!
    \brief Copy flags from one arbitrary object to another
    \command dest the object to copy the flags to