Add ZAP_TON_* (taken from Q931.h, drop Q921.h and Q931.h include from openzap.h and fixup all users of the old Q931_TON_ enum values)

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@707 a93c3328-9c30-0410-af19-c9cd2b2d52af

libs/openzap/src/include/openzap.h

@@ -167,8 +167,6 @@
 #include "libteletone.h"
 #include "zap_buffer.h"
 #include "zap_threadmutex.h"
-#include "Q921.h"
-#include "Q931.h"
 
 #define XX if (0)
 
@@ -410,6 +408,19 @@ struct zap_fsk_modulator {
 	int16_t sample_buffer[64];
 };
 
+/**
+ * Type Of Number (TON)
+ */
+typedef enum {
+	ZAP_TON_UNKNOWN = 0,
+	ZAP_TON_INTERNATIONAL,
+	ZAP_TON_NATIONAL,
+	ZAP_TON_NETWORK_SPECIFIC,
+	ZAP_TON_SUBSCRIBER_NUMBER,
+	ZAP_TON_ABBREVIATED_NUMBER,
+	ZAP_TON_RESERVED
+} zap_ton_t;
+
 typedef struct {
 	char digits[25];
 	uint8_t type;

libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c

@@ -32,7 +32,6 @@
  */
 
 #include "openzap.h"
-#include "zap_isdn.h"
 #include "Q931.h"
 #include "Q921.h"
 #ifdef WIN32
@@ -41,6 +40,8 @@
 #include <sys/time.h>
 #endif
 
+#include "zap_isdn.h"
+
 #define LINE "--------------------------------------------------------------------------------"
 //#define IODEBUG
 

libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c

@@ -463,13 +463,13 @@ static __inline__ void state_advance(zap_channel_t *zchan)
 			
 			dp = zchan->caller_data.ani.type;
 			switch(dp) {
-			case Q931_TON_NATIONAL:
+			case ZAP_TON_NATIONAL:
 				dp = PRI_NATIONAL_ISDN;
 				break;
-			case Q931_TON_INTERNATIONAL:
+			case ZAP_TON_INTERNATIONAL:
 				dp = PRI_INTERNATIONAL_ISDN;
 				break;
-			case Q931_TON_SUBSCRIBER_NUMBER:
+			case ZAP_TON_SUBSCRIBER_NUMBER:
 				dp = PRI_LOCAL_ISDN;
 				break;
 			default: