[Asterisk-cvs] libpri-matt pri_internal.h, 1.4, 1.5 pri_timers.h, 1.1.1.1, 1.2 pritest.c, 1.1.1.1, 1.2

[mattf at lists.digium.com]

Update of /usr/cvsroot/libpri-matt
In directory mongoose.digium.com:/tmp/cvs-serv9682

Modified Files:
	pri_internal.h pri_timers.h pritest.c 
Log Message:
QSIG Switchtype now works, fixed bug with the PRI_SWITCH_* defines that was
causing sapi to be overwritten by the GR_303 values


Index: pri_internal.h
===================================================================
RCS file: /usr/cvsroot/libpri-matt/pri_internal.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pri_internal.h	7 Dec 2004 17:46:05 -0000	1.4
+++ pri_internal.h	9 Dec 2004 16:45:08 -0000	1.5
@@ -127,8 +127,8 @@
 };
 
 /* Internal switch types */
-#define PRI_SWITCH_GR303_EOC_PATH	10
-#define PRI_SWITCH_GR303_TMC_SWITCHING	11
+#define PRI_SWITCH_GR303_EOC_PATH	11
+#define PRI_SWITCH_GR303_TMC_SWITCHING	12
 
 /* q931_call datastructure */
 

Index: pri_timers.h
===================================================================
RCS file: /usr/cvsroot/libpri-matt/pri_timers.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- pri_timers.h	5 Nov 2004 19:23:16 -0000	1.1.1.1
+++ pri_timers.h	9 Dec 2004 16:45:08 -0000	1.2
@@ -67,6 +67,7 @@
 #define PRI_TIMERS_NI1 PRI_TIMERS_DEFAULT
 #define PRI_TIMERS_GR303_EOC PRI_TIMERS_DEFAULT
 #define PRI_TIMERS_GR303_TMC PRI_TIMERS_DEFAULT
+#define PRI_TIMERS_QSIG PRI_TIMERS_DEFAULT
 
 #define PRI_TIMERS_ALL {	PRI_TIMERS_UNKNOWN, \
 				PRI_TIMERS_NI2, \
@@ -77,7 +78,8 @@
 				PRI_TIMERS_EUROISDN_T1, \
 				PRI_TIMERS_NI1, \
 				PRI_TIMERS_GR303_EOC, \
-				PRI_TIMERS_GR303_TMC \
+				PRI_TIMERS_GR303_TMC, \
+				PRI_TIMERS_QSIG \
 			}
 
 #endif

Index: pritest.c
===================================================================
RCS file: /usr/cvsroot/libpri-matt/pritest.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- pritest.c	5 Nov 2004 19:23:15 -0000	1.1.1.1
+++ pritest.c	9 Dec 2004 16:45:08 -0000	1.2
@@ -124,6 +124,8 @@
 		return PRI_SWITCH_GR303_EOC;
 	if (!strcasecmp(swtype, "gr303tmc"))
 		return PRI_SWITCH_GR303_TMC;
+	if (!strcasecmp(swtype, "qsig"))
+		return PRI_SWITCH_QSIG;
 	return -1;
 }