Version 0.3.3 from FTP

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

2 files changed, 16 insertions, 4 deletions

diff --git a/zaptel.h b/zaptel.h
index 57d085a..e6edde9 100755
--- a/zaptel.h
+++ b/zaptel.h
@@ -119,6 +119,8 @@
 #define ZT_POLICY_IMMEDIATE	 0		/* Start play/record immediately */
 #define ZT_POLICY_WHEN_FULL  1		/* Start play/record when buffer is full */
 
+#define	RING_DEBOUNCE_TIME	500	/* 500 ms ring debounce time */
+
 #ifdef __KERNEL__
 /* Echo cancellation */
 #if defined(ECHO_CAN_STEVE)
@@ -489,6 +491,11 @@ char dialstr[ZT_MAX_DTMF_BUF];
  */
 #define ZT_CHANDIAG		_IOR (ZT_CODE, 44, int) 
 
+/* 
+ * Obtain received signalling
+ */
+#define ZT_GETRXBITS _IOR (ZT_CODE, 45, int)
+
 /*
  *  60-80 are reserved for private drivers
  *  80-85 are reserved for dynamic span stuff
@@ -910,6 +917,9 @@ struct zt_chan {
 	int		rxflashtime; /* rx flash time (ms) */
 	int		debouncetime;  /* FXS GS sig debounce time (ms) */
 
+	/* RING debounce timer */
+	int	ringdebtimer;
+
 	/* RBS timers */
 	int 	itimer;
 	int 	otimer;
diff --git a/zttool.c b/zttool.c
index 7122d1a..6ecd883 100755
--- a/zttool.c
+++ b/zttool.c
@@ -191,10 +191,10 @@ 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(tcbits,0, sizeof(tcbits));
+	memset(tdbits,0, sizeof(tdbits));
+	memset(rcbits,0, sizeof(rcbits));
+	memset(rdbits,0, sizeof(rdbits));
 	memset(tabits,32, s[span].totalchans);
 	memset(tbbits,32, s[span].totalchans);
 	memset(rabits,32, s[span].totalchans);
@@ -420,6 +420,7 @@ static void show_span(int span)
 			}
 			break;
 		default:
+			break;
 		}
 	}	
 
@@ -488,6 +489,7 @@ static void show_spans(void)
 			}
 			break;
 		default:
+			break;
 		}
 	}
 }