Merge in kernel level MTP2 branch.

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4250 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 6 insertions, 0 deletions

diff --git a/ztcfg.c b/ztcfg.c
index 94c40c4..a880f3e 100644
--- a/ztcfg.c
+++ b/ztcfg.c
@@ -160,6 +160,8 @@ static const char *sigtype_to_str(const int sig)
 		return "HDLC with FCS check";
 	case ZT_SIG_HARDHDLC:
 		return "Hardware assisted D-channel";
+	case ZT_SIG_MTP2:
+		return "MTP2";
 	default:
 		return "Unknown";
 	}
@@ -590,6 +592,9 @@ static int chanconfig(char *keyword, char *args)
 			} else if (!strcasecmp(keyword, "hardhdlc")) {
 				sig[x] = "Hardware assisted D-channel";
 				cc[x].sigtype = ZT_SIG_HARDHDLC;
+			} else if (!strcasecmp(keyword, "mtp2")) {
+				sig[x] = "MTP2";
+				cc[x].sigtype = ZT_SIG_MTP2;
 			} else {
 				fprintf(stderr, "Huh? (%s)\n", keyword);
 			}
@@ -1201,6 +1206,7 @@ static struct handler {
 	{ "nethdlc", chanconfig },
 	{ "fcshdlc", chanconfig },
 	{ "hardhdlc", chanconfig },
+	{ "mtp2", chanconfig },
 	{ "dchan", chanconfig },
 	{ "bchan", chanconfig },
 	{ "indclear", chanconfig },