From: Moises Silva <moy@sangoma.com>
Date: Mon, 15 Nov 2010 19:00:49 +0000 (-0500)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~265^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3e55a26ef069a6ba5c3574b6c31a00d0299bbec;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
---

f3e55a26ef069a6ba5c3574b6c31a00d0299bbec
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
index e269809c1c,124cd965b4..cb508a54b4
--- 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,11 -34,14 +34,13 @@@
  
  #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);
- 
+ 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;