Merged revisions 132510 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r132510 | tilghman | 2008-07-21 15:59:03 -0500 (Mon, 21 Jul 2008) | 5 lines

Optionally build integer-based routines for FSK tone decoding (but default
to the more accurate float-based routines).
(Closes issue #11679)
(Step 1 of 2)

........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132512 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 71 insertions, 0 deletions

diff --git a/include/asterisk/fskmodem_float.h b/include/asterisk/fskmodem_float.h
new file mode 100644
index 000000000..3b350fb55
--- /dev/null
+++ b/include/asterisk/fskmodem_float.h
@@ -0,0 +1,71 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ * \brief FSK Modem Support
+ * \note Includes code and algorithms from the Zapata library.
+ */
+
+#ifndef _ASTERISK_FSKMODEM_H
+#define _ASTERISK_FSKMODEM_H
+
+#define PARITY_NONE		0
+#define PARITY_EVEN		1
+#define PARITY_ODD		2
+
+
+#define NCOLA 0x4000
+
+typedef struct {
+	float spb;	/*!< Samples / Bit */
+	int nbit;	/*!< Number of Data Bits (5,7,8) */
+	float nstop;	/*!< Number of Stop Bits 1,1.5,2  */
+	int parity;	/*!< Parity 0=none 1=even 2=odd */
+	int hdlc;	/*!< Modo Packet */
+	float x0;
+	float x1;
+	float x2;
+	float cont;
+	int bw;				/*!< Bandwidth */
+	double fmxv[8],fmyv[8];		/*!< filter stuff for M filter */
+	int	fmp;			/*!< pointer for M filter */
+	double fsxv[8],fsyv[8];		/*!< filter stuff for S filter */
+	int	fsp;			/*!< pointer for S filter */
+	double flxv[8],flyv[8];		/*!< filter stuff for L filter */
+	int	flp;			/*!< pointer for L filter */
+	int f_mark_idx;			/*!< Mark frequency index (f_M-500)/5 */
+	int f_space_idx;		/*!< Space frequency index (f_S-500)/5 */
+	int state;
+	int pcola;			/*!< Pointer to data queues */
+	float cola_in[NCOLA];		/*!< Queue of input samples */
+	float cola_filter[NCOLA];	/*!< Queue of samples after filters */
+	float cola_demod[NCOLA];	/*!< Queue of demodulated samples */
+} fsk_data;
+
+/* \brief Retrieve a serial byte into outbyte.
+   Buffer is a pointer into a series of
+   shorts and len records the number of bytes in the buffer.  len will be
+   overwritten with the number of bytes left that were not consumed.
+   \return return value is as follows:
+   \arg 0: Still looking for something...
+   \arg 1: An output byte was received and stored in outbyte
+   \arg -1: An error occured in the transmission
+   He must be called with at least 80 bytes of buffer. */
+int fsk_serial(fsk_data *fskd, short *buffer, int *len, int *outbyte);
+
+#endif /* _ASTERISK_FSKMODEM_H */
diff --git a/include/asterisk/fskmodem.h b/include/asterisk/fskmodem_int.h
index d50e8abde..d50e8abde 100644
--- a/include/asterisk/fskmodem.h
+++ b/include/asterisk/fskmodem_int.h