state handling code nearly complete

1 files changed, 6 insertions, 6 deletions

diff --git a/xhfc/xhfc.h b/xhfc/xhfc.h
index 793cf05..0b4fe00 100644
--- a/xhfc/xhfc.h
+++ b/xhfc/xhfc.h
@@ -85,6 +85,8 @@ enum { XHFC_T1, XHFC_T2, XHFC_T3, XHFC_T4 };
 # define MIN(a, b)		(((a) < (b))? (a) : (b))
 #endif
 
+#define NOT_RUNNING UINT_MAX
+
 enum data_dir { TRANSMIT = 0, RECEIVE = 1 };
 
 #define xhfc_info(x, format, arg...)         \
@@ -114,16 +116,14 @@ struct xhfc_span {
 
 	int port;	/* (physical) S/T port number */
 	int nt;		/* 1 if the port is nt, 0 if it's TE	*/
+	
 
 	/* Got the following from DAHDI */
-	int oldstate;
-	int state, previous_state;
-	int newalarm;
-	unsigned long alarmtimer;
+	u8 state, prev_state;
+
 	struct dahdi_chan* sigchan;
 	int sigactive;
-	unsigned long hfc_timers[4];	/* T1, T2, T3, T4 */
-	int hfc_timer_on[4]; 		/* 1=timer active */
+	unsigned int t1, t3, f6_f7_transition;
 
 	unsigned long non_rx_cnt;
 };