[asterisk-commits] branch crichter/0.4.0 r31441 - in /team/crichter/0.4.0: ./ channels/misdn/ co...

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Thu Jun  1 12:14:15 2006
New Revision: 31441

URL: http://svn.digium.com/view/asterisk?rev=31441&view=rev
Log:
Merged revisions 31327,31408,31410 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/crichter/0.3.0

........
r31327 | root | 2006-06-01 15:00:37 +0200 (Do, 01 Jun 2006) | 1 line

automerge commit
........
r31408 | crichter | 2006-06-01 18:24:23 +0200 (Do, 01 Jun 2006) | 1 line

unified the PH_CONTROL Interface for the mISDN_dsp interface to int
........
r31410 | crichter | 2006-06-01 18:40:47 +0200 (Do, 01 Jun 2006) | 1 line

the interface needs to be changed as well..
........

Modified:
    team/crichter/0.4.0/   (props changed)
    team/crichter/0.4.0/channels/misdn/isdn_lib.c
    team/crichter/0.4.0/channels/misdn/isdn_lib.h
    team/crichter/0.4.0/configs/sip.conf.sample

Propchange: team/crichter/0.4.0/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  1 12:14:15 2006
@@ -1,1 +1,1 @@
-/team/crichter/0.3.0:1-31324
+/team/crichter/0.3.0:1-31439

Modified: team/crichter/0.4.0/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.4.0/channels/misdn/isdn_lib.c?rev=31441&r1=31440&r2=31441&view=diff
==============================================================================
--- team/crichter/0.4.0/channels/misdn/isdn_lib.c (original)
+++ team/crichter/0.4.0/channels/misdn/isdn_lib.c Thu Jun  1 12:14:15 2006
@@ -166,7 +166,7 @@
 void te_lib_destroy(int midev) ;
 struct misdn_bchannel *manager_find_bc_by_pid(int pid);
 struct misdn_bchannel *manager_find_bc_holded(struct misdn_bchannel* bc);
-void manager_ph_control_block(struct misdn_bchannel *bc, long c1, void *c2, int c2_len);
+void manager_ph_control_block(struct misdn_bchannel *bc, int c1, void *c2, int c2_len);
 void manager_clean_bc(struct misdn_bchannel *bc );
 void manager_bchannel_setup (struct misdn_bchannel *bc);
 void manager_bchannel_cleanup (struct misdn_bchannel *bc);
@@ -3680,17 +3680,17 @@
 /*
  * send control information to the channel (dsp-module)
  */
-void manager_ph_control(struct misdn_bchannel *bc, long c1, long c2)
-{
-	unsigned char buffer[mISDN_HEADER_LEN+ 2*sizeof(long)];
+void manager_ph_control(struct misdn_bchannel *bc, int c1, int c2)
+{
+	unsigned char buffer[mISDN_HEADER_LEN+ 2*sizeof(int)];
 	iframe_t *ctrl = (iframe_t *)buffer; /* preload data */
-	unsigned long *d = (unsigned long *)&ctrl->data.p;
+	unsigned int *d = (unsigned int*)&ctrl->data.p;
 	struct misdn_stack *stack=get_stack_by_bc(bc);
 	
 	ctrl->prim = PH_CONTROL | REQUEST;
 	ctrl->addr = bc->addr | FLG_MSG_DOWN;
 	ctrl->dinfo = 0;
-	ctrl->len = sizeof(unsigned long)*2;
+	ctrl->len = sizeof(unsigned int)*2;
 	*d++ = c1;
 	*d++ = c2;
 	mISDN_write(stack->midev, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC);
@@ -3699,17 +3699,17 @@
 /*
  * send control information to the channel (dsp-module)
  */
-void manager_ph_control_block(struct misdn_bchannel *bc, long c1, void *c2, int c2_len)
-{
-	unsigned char buffer[mISDN_HEADER_LEN+sizeof(long)+c2_len];
+void manager_ph_control_block(struct misdn_bchannel *bc, int c1, void *c2, int c2_len)
+{
+	unsigned char buffer[mISDN_HEADER_LEN+sizeof(int)+c2_len];
 	iframe_t *ctrl = (iframe_t *)buffer;
-	unsigned long *d = (unsigned long *)&ctrl->data.p;
+	unsigned int *d = (unsigned int *)&ctrl->data.p;
 	struct misdn_stack *stack=get_stack_by_bc(bc);
 	
 	ctrl->prim = PH_CONTROL | REQUEST;
 	ctrl->addr = bc->addr | FLG_MSG_DOWN;
 	ctrl->dinfo = 0;
-	ctrl->len = sizeof(unsigned long) + c2_len;
+	ctrl->len = sizeof(unsigned int) + c2_len;
 	*d++ = c1;
 	memcpy(d, c2, c2_len);
 	mISDN_write(stack->midev, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC);

Modified: team/crichter/0.4.0/channels/misdn/isdn_lib.h
URL: http://svn.digium.com/view/asterisk/team/crichter/0.4.0/channels/misdn/isdn_lib.h?rev=31441&r1=31440&r2=31441&view=diff
==============================================================================
--- team/crichter/0.4.0/channels/misdn/isdn_lib.h (original)
+++ team/crichter/0.4.0/channels/misdn/isdn_lib.h Thu Jun  1 12:14:15 2006
@@ -350,7 +350,7 @@
 
 int misdn_lib_tx2misdn_frm(struct misdn_bchannel *bc, void *data, int len);
 
-void manager_ph_control(struct misdn_bchannel *bc, long c1, long c2);
+void manager_ph_control(struct misdn_bchannel *bc, int c1, int c2);
 
 
 int misdn_lib_port_restart(int port);

Modified: team/crichter/0.4.0/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/crichter/0.4.0/configs/sip.conf.sample?rev=31441&r1=31440&r2=31441&view=diff
==============================================================================
--- team/crichter/0.4.0/configs/sip.conf.sample (original)
+++ team/crichter/0.4.0/configs/sip.conf.sample Thu Jun  1 12:14:15 2006
@@ -362,7 +362,6 @@
 ;allow=alaw
 ;allow=g723.1			; Asterisk only supports g723.1 pass-thru!
 ;allow=g729			; Pass-thru only unless g729 license obtained
-;astdb=chan2ext/SIP/grandstream1=1234	; ensures an astDB entry exists
 
 
 ;[xlite1]