X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=ss5.h;h=750e9ae747ee74ef4ec5258b7d6e326530993ae2;hp=238501fb5ec76404f0217299ae06d9d1a669de53;hb=6642360dcf1eecba954ad04d2d0a78753f8e5182;hpb=b987a1bbbcabbf183ebe009903778671a1591337

diff --git a/ss5.h b/ss5.h
index 238501f..750e9ae 100644
--- a/ss5.h
+++ b/ss5.h
@@ -9,23 +9,23 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#define SS5_ENABLE			0x00000001
-#define SS5_FEATURE_CONNECT		0x00000002
-#define SS5_FEATURE_NODISCONNECT	0x00000004
-#define SS5_FEATURE_RELEASEGUARDTIMER	0x00000008
-#define SS5_FEATURE_BELL		0x00000010
-#define SS5_FEATURE_PULSEDIALING	0x00000020
-#define SS5_FEATURE_DELAY		0x00000040
-#define SS5_FEATURE_STAR_RELEASE	0x00000080
-#define SS5_FEATURE_SUPPRESS		0x00000100
+#define SS5_ENABLE			0x00000001 /* if ccitt5 is defined in interface.conf */
+#define SS5_FEATURE_CONNECT		0x00000002 /* send connect to originator of the call */
+#define SS5_FEATURE_NODISCONNECT	0x00000004 /* do not send disconnect to originator of call */
+#define SS5_FEATURE_RELEASEGUARDTIMER	0x00000008 /* prevent blueboxing by forcing long duration of releas guard signal */
+#define SS5_FEATURE_BELL		0x00000010 /* allow breaking and pulse dialing using 2600 Hz */
+#define SS5_FEATURE_PULSEDIALING	0x00000020 /* outgoing exchange sends 2600 Hz pulses instead of mf tones */
+#define SS5_FEATURE_DELAY		0x00000040 /* simulate round trip delay by delaying decoder output */
+#define SS5_FEATURE_RELEASE		0x00000080 /* release if incomming exchange disconnets */
+#define SS5_FEATURE_MUTE		0x00000100 /* mute audio path while 2600/2400 Hz tones are detected */
+#define SS5_FEATURE_QUALITY		0x00000200 /* indicate quality of received digits */
 
 /* SS5 port classes */
 class Pss5 : public PmISDN
 {
 	public:
-	Pss5(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive, int mode);
+	Pss5(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, struct interface *interface, int channel, int exclusive, int mode);
 	~Pss5();
-	int handler(void);
 	int message_epoint(unsigned int epoint_id, int message, union parameter *param);
 	void set_tone(const char *dir, const char *name);
 
@@ -34,20 +34,22 @@ class Pss5 : public PmISDN
 	char p_m_s_dial[64]; /* current dialing register */
 	int p_m_s_digit_i; /* current digit of register counter */
 	int p_m_s_pulsecount; /* counts pule dialing half cycles */
-	char p_m_s_last_digit; /* stores last digit to fill short signal losses */
+	char p_m_s_last_digit; /* stores last digit that was detected, to fill short signal losses */
+	char p_m_s_last_digit_used; /* stores last digit that was used, to ignore short changes of signal due to noise */
 	int p_m_s_signal_loss; /* sample counter for loss of signal check */
 	int p_m_s_decoder_count; /* samples currently decoded */
 	unsigned char p_m_s_decoder_buffer[SS5_DECODER_NPOINTS]; /* buffer for storing one goertzel window */
 	unsigned char p_m_s_delay_digits[3000/SS5_DECODER_NPOINTS]; /* delay buffer for received digits */
 	unsigned char p_m_s_delay_mute[400/SS5_DECODER_NPOINTS]; /* 40 ms delay on mute, so a 'chirp' can be heared */
 	int p_m_s_sample_nr; /* decoder's sample number, counter */
+	double p_m_s_quality_value; /* quality report */
+	int p_m_s_quality_count; /* quality report */
 	int p_m_s_recog; /* sample counter to wait for signal recognition time */
-	double p_m_s_timer;
-        void (Pss5::*p_m_s_timer_fn)(void);
-	int p_m_s_answer; /* queued signal */
-	int p_m_s_busy_flash; /* queued signal */
-	int p_m_s_clear_back; /* queued signal */
+	struct lcr_work p_m_s_queue;
+	int p_m_s_queued_signal; /* queued signal */
+	struct lcr_timer p_m_s_timer; /* dialing timeout */
 
+	void new_state(int state);		/* set new state */
 	void _new_ss5_state(int state, const char *func, int line);
 	void _new_ss5_signal(int signal, const char *func, int line);
 	void inband_receive(unsigned char *buffer, int len);
@@ -56,7 +58,7 @@ class Pss5 : public PmISDN
 	int inband_dial_pulse(unsigned char *buffer, int len, int count);
 	void start_signal(int);
 	void start_outgoing(void);
-	void do_release(int cause, int location);
+	void do_release(int cause, int location, int signal);
 	void do_setup(char *digit, int complete);
 
 	void seizing_ind(void);
@@ -76,6 +78,9 @@ class Pss5 : public PmISDN
 	void message_disconnect(unsigned int epoint_id, int message_id, union parameter *param);
 	void message_release(unsigned int epoint_id, int message_id, union parameter *param);
 
+	void register_timeout(void);
+	void process_queue(void);
+
 };
 
 #define new_ss5_state(a) _new_ss5_state(a, __FUNCTION__, __LINE__)