Version 0.3.2 from FTP

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

1 files changed, 51 insertions, 6 deletions

diff --git a/zttool.c b/zttool.c
index 21c4d8e..7122d1a 100755
--- a/zttool.c
+++ b/zttool.c
@@ -177,9 +177,13 @@ static void show_bits(int span, newtComponent bitbox, newtComponent inuse, newtC
 	char c;
 	char tabits[80];
 	char tbbits[80];
+	char tcbits[80];
+	char tdbits[80];
 	char rabits[80];
 	char rbbits[80];
-	char tmp[320];
+	char rcbits[80];
+	char rdbits[80];
+	char tmp[1024];
 	
 	int use = 0;
 	
@@ -187,10 +191,18 @@ static void show_bits(int span, newtComponent bitbox, newtComponent inuse, newtC
 	memset(tbbits,0, sizeof(tbbits));
 	memset(rabits,0, sizeof(rabits));
 	memset(rbbits,0, sizeof(rbbits));
+	memset(tabits,0, sizeof(tcbits));
+	memset(tbbits,0, sizeof(tdbits));
+	memset(rabits,0, sizeof(rcbits));
+	memset(rbbits,0, sizeof(rdbits));
 	memset(tabits,32, s[span].totalchans);
 	memset(tbbits,32, s[span].totalchans);
 	memset(rabits,32, s[span].totalchans);
 	memset(rbbits,32, s[span].totalchans);
+	memset(tcbits,32, s[span].totalchans);
+	memset(tdbits,32, s[span].totalchans);
+	memset(rcbits,32, s[span].totalchans);
+	memset(rdbits,32, s[span].totalchans);
 	
 	for (x=0;x<ZT_MAX_CHANNELS;x++) {
 		memset(&zp, 0, sizeof(zp));
@@ -208,6 +220,15 @@ static void show_bits(int span, newtComponent bitbox, newtComponent inuse, newtC
 					else
 						rbbits[zp.chanpos - 1] = '0';
 
+					if (zp.rxbits & ZT_CBIT)
+						rcbits[zp.chanpos - 1] = '1';
+					else
+						rcbits[zp.chanpos - 1] = '0';
+					if (zp.rxbits & ZT_DBIT)
+						rdbits[zp.chanpos - 1] = '1';
+					else
+						rdbits[zp.chanpos - 1] = '0';
+
 					if (zp.txbits & ZT_ABIT)
 						tabits[zp.chanpos - 1] = '1';
 					else
@@ -216,21 +237,33 @@ static void show_bits(int span, newtComponent bitbox, newtComponent inuse, newtC
 						tbbits[zp.chanpos - 1] = '1';
 					else
 						tbbits[zp.chanpos - 1] = '0';
+					if (zp.txbits & ZT_CBIT)
+						tcbits[zp.chanpos - 1] = '1';
+					else
+						tcbits[zp.chanpos - 1] = '0';
+					if (zp.txbits & ZT_DBIT)
+						tdbits[zp.chanpos - 1] = '1';
+					else
+						tdbits[zp.chanpos - 1] = '0';
 				} else {
 					c = '-';
 					if (!zp.sigtype)
 						c = ' ';
 					tabits[zp.chanpos - 1] = c;
 					tbbits[zp.chanpos - 1] = c;
+					tcbits[zp.chanpos - 1] = c;
+					tdbits[zp.chanpos - 1] = c;
 					rabits[zp.chanpos - 1] = c;
 					rbbits[zp.chanpos - 1] = c;
+					rcbits[zp.chanpos - 1] = c;
+					rdbits[zp.chanpos - 1] = c;
 				}
 				if (zp.rxisoffhook)
 					use++;
 			}
 		}
 	}
-	snprintf(tmp, sizeof(tmp), "%s\n%s\n\n%s\n%s", tabits, tbbits,rabits,rbbits);
+	snprintf(tmp, sizeof(tmp), "%s\n%s\n%s\n%s\n\n%s\n%s\n%s\n%s", tabits, tbbits,tcbits,tdbits,rabits,rbbits,rcbits,rdbits);
 	newtTextboxSetText(bitbox, tmp);	
 	sprintf(tmp, "%3d/%3d/%3d", s[span].totalchans, s[span].numchans, use);
 	newtTextboxSetText(inuse, tmp);
@@ -280,7 +313,7 @@ static void show_span(int span)
 	}
 
 	snprintf(info2, sizeof(info2), "%-59s            F10=Back", s[span].desc);
-	newtOpenWindow(10,3,60,16, s[span].desc);
+	newtOpenWindow(10,2,60,20, s[span].desc);
 	newtPushHelpLine(info2);
 
 	back = newtButton(48,12,"Back");
@@ -295,7 +328,7 @@ static void show_span(int span)
 	s1[max] = '\0';
 	s2[max] = '\0';
 
-	bitbox = newtTextbox(8,10,max,5,0);
+	bitbox = newtTextbox(8,10,max,9,0);
 	newtFormAddComponent(form, bitbox);
 
 	label = newtLabel(8,8,s1);
@@ -313,10 +346,22 @@ static void show_span(int span)
 	label = newtLabel(4,11,"TxB");
 	newtFormAddComponent(form, label);
 
-	label = newtLabel(4,13,"RxA");
+	label = newtLabel(4,12,"TxC");
+	newtFormAddComponent(form, label);
+
+	label = newtLabel(4,13,"TxD");
+	newtFormAddComponent(form, label);
+
+	label = newtLabel(4,15,"RxA");
+	newtFormAddComponent(form, label);
+
+	label = newtLabel(4,16,"RxB");
+	newtFormAddComponent(form, label);
+
+	label = newtLabel(4,17,"RxC");
 	newtFormAddComponent(form, label);
 
-	label = newtLabel(4,14,"RxB");
+	label = newtLabel(4,18,"RxD");
 	newtFormAddComponent(form, label);