Remove chan_usbradio and app_rpt.

These modules are being maintained outside of the tree and have been for a long
time now, so it doesn't make sense to keep them here.

Review: https://reviewboard.asterisk.org/r/1764/
........

Merged revisions 359050 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 359051 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@359052 65c4cc65-6c06-0410-ace0-fbb531ad65f3

5 files changed, 0 insertions, 9278 deletions

diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
deleted file mode 100644
index f45514261..000000000
--- a/channels/chan_usbradio.c
+++ /dev/null
@@ -1,4035 +0,0 @@
-#define	NEW_ASTERISK
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 1999 - 2005, Digium, Inc.
- * Copyright (C) 2007 - 2008, Jim Dixon
- *
- * Jim Dixon, WB6NIL <jim@lambdatel.com>
- * Steve Henke, W9SH  <w9sh@arrl.net>
- * Based upon work by Mark Spencer <markster@digium.com> and Luigi Rizzo
- *
- * 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 Channel driver for CM108 USB Cards with Radio Interface
- *
- * \author Jim Dixon  <jim@lambdatel.com>
- * \author Steve Henke  <w9sh@arrl.net>
- *
- * \par See also
- * \arg \ref Config_usbradio
- *
- * \ingroup channel_drivers
- */
-
-/*** MODULEINFO
-	<depend>oss</depend>
-	<depend>alsa</depend>
-	<depend>usb</depend>
-	<defaultenabled>no</defaultenabled>
-	<support_level>extended</support_level>
- ***/
-
-/*** MAKEOPTS
-<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes">
-	<member name="RADIO_RTX" displayname="Build RTX/DTX Radio Programming" touch_on_change="channels/chan_usbradio.c channels/xpmr/xpmr.h">
-		<defaultenabled>no</defaultenabled>
-		<depend>chan_usbradio</depend>
-		<support_level>extended</support_level>
-	</member>
-	<member name="RADIO_XPMRX" displayname="Build Experimental Radio Protocols" touch_on_change="channels/chan_usbradio.c">
-		<defaultenabled>no</defaultenabled>
-		<depend>chan_usbradio</depend>
-		<support_level>extended</support_level>
-	</member>
-</category>
- ***/
-
-// 20070918 1600 EDT sph@xelatec.com changing to rx driven streams
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
-#include <stdio.h>
-#include <ctype.h>
-#include <math.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef HAVE_SYS_IO_H
-#include <sys/io.h>
-#endif
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <usb.h>
-#include <alsa/asoundlib.h>
-
-//#define HAVE_XPMRX				1
-#ifdef RADIO_XPMRX
-#define HAVE_XPMRX				1
-#endif
-
-#define CHAN_USBRADIO           1
-#define DEBUG_USBRADIO          0	
-#define DEBUG_CAPTURES	 		1
-#define DEBUG_CAP_RX_OUT		0   		
-#define DEBUG_CAP_TX_OUT	    0			
-#define DEBUG_FILETEST			0			 
-
-#define RX_CAP_RAW_FILE			"/tmp/rx_cap_in.pcm"
-#define RX_CAP_TRACE_FILE		"/tmp/rx_trace.pcm"
-#define RX_CAP_OUT_FILE			"/tmp/rx_cap_out.pcm"
-
-#define TX_CAP_RAW_FILE			"/tmp/tx_cap_in.pcm"
-#define TX_CAP_TRACE_FILE		"/tmp/tx_trace.pcm"
-#define TX_CAP_OUT_FILE			"/tmp/tx_cap_out.pcm"
-
-#define	MIXER_PARAM_MIC_PLAYBACK_SW "Mic Playback Switch"
-#define MIXER_PARAM_MIC_PLAYBACK_VOL "Mic Playback Volume"
-#define	MIXER_PARAM_MIC_CAPTURE_SW "Mic Capture Switch"
-#define	MIXER_PARAM_MIC_CAPTURE_VOL "Mic Capture Volume"
-#define	MIXER_PARAM_MIC_BOOST "Auto Gain Control"
-#define	MIXER_PARAM_SPKR_PLAYBACK_SW "Speaker Playback Switch"
-#define	MIXER_PARAM_SPKR_PLAYBACK_VOL "Speaker Playback Volume"
-
-#define	DELIMCHR ','
-#define	QUOTECHR 34
-
-#define	READERR_THRESHOLD 50
-
-#include "./xpmr/xpmr.h"
-#ifdef HAVE_XPMRX
-#include "./xpmrx/xpmrx.h"
-#include "./xpmrx/bitweight.h"
-#endif
-
-#if 0
-#define traceusb1(a) {printf a;}
-#else
-#define traceusb1(a)
-#endif
-
-#if 0
-#define traceusb2(a) {printf a;}
-#else
-#define traceusb2(a)
-#endif
-
-#ifdef __linux
-#include <linux/soundcard.h>
-#elif defined(__FreeBSD__)
-#include <sys/soundcard.h>
-#else
-#include <soundcard.h>
-#endif
-
-#include "asterisk/lock.h"
-#include "asterisk/frame.h"
-#include "asterisk/logger.h"
-#include "asterisk/callerid.h"
-#include "asterisk/channel.h"
-#include "asterisk/module.h"
-#include "asterisk/options.h"
-#include "asterisk/pbx.h"
-#include "asterisk/config.h"
-#include "asterisk/cli.h"
-#include "asterisk/utils.h"
-#include "asterisk/causes.h"
-#include "asterisk/endian.h"
-#include "asterisk/stringfields.h"
-#include "asterisk/abstract_jb.h"
-#include "asterisk/musiconhold.h"
-#include "asterisk/dsp.h"
-
-#ifndef	NEW_ASTERISK
-
-/* ringtones we use */
-#include "busy.h"
-#include "ringtone.h"
-#include "ring10.h"
-#include "answer.h"
-
-#endif
-
-#define C108_VENDOR_ID		0x0d8c
-#define C108_PRODUCT_ID  	0x000c
-#define C108_HID_INTERFACE	3
-
-#define HID_REPORT_GET		0x01
-#define HID_REPORT_SET		0x09
-
-#define HID_RT_INPUT		0x01
-#define HID_RT_OUTPUT		0x02
-
-#define	EEPROM_START_ADDR	6
-#define	EEPROM_END_ADDR		63
-#define	EEPROM_PHYSICAL_LEN	64
-#define EEPROM_TEST_ADDR	EEPROM_END_ADDR
-#define	EEPROM_MAGIC_ADDR	6
-#define	EEPROM_MAGIC		34329
-#define	EEPROM_CS_ADDR		62
-#define	EEPROM_RXMIXERSET	8
-#define	EEPROM_TXMIXASET	9
-#define	EEPROM_TXMIXBSET	10
-#define	EEPROM_RXVOICEADJ	11
-#define	EEPROM_RXCTCSSADJ	13
-#define	EEPROM_TXCTCSSADJ	15
-#define	EEPROM_RXSQUELCHADJ	16
-
-/*! Global jitterbuffer configuration - by default, jb is disabled
- *  \note Values shown here match the defaults shown in usbradio.conf.sample */
-static struct ast_jb_conf default_jbconf =
-{
-	.flags = 0,
-	.max_size = 200,
-	.resync_threshold = 1000,
-	.impl = "fixed",
-	.target_extra = 40,
-};
-static struct ast_jb_conf global_jbconf;
-
-/*
- * usbradio.conf parameters are
-START_CONFIG
-
-[general]
-    ; General config options which propigate to all devices, with
-    ; default values shown. You may have as many devices as the
-    ; system will allow. You must use one section per device, with
-    ; [usb] generally (although its up to you) being the first device.
-    ;
-    ;
-    ; debug = 0x0		; misc debug flags, default is 0
-
-	; Set the device to use for I/O
-	; devicenum = 0
-	; Set hardware type here
-	; hdwtype=0               ; 0=limey, 1=sph
-
-	; rxboost=0          ; no rx gain boost
-	; rxctcssrelax=1        ; reduce talkoff from radios w/o CTCSS Tx HPF
-	; rxctcssfreqs=100.0,123.0      ; list of rx ctcss freq in floating point. must be in table
-	; txctcssfreqs=100.0,123.0      ; list tx ctcss freq, any frequency permitted
-	; txctcssdefault=100.0      ; default tx ctcss freq, any frequency permitted
-
-	; carrierfrom=dsp     ;no,usb,usbinvert,dsp,vox
-	; ctcssfrom=dsp       ;no,usb,dsp
-
-	; rxdemod=flat            ; input type from radio: no,speaker,flat
-	; txprelim=yes            ; output is pre-emphasised and limited
-	; txtoctype=no            ; no,phase,notone
-
-	; txmixa=composite        ;no,voice,tone,composite,auxvoice
-	; txmixb=no               ;no,voice,tone,composite,auxvoice
-
-	; invertptt=0
-
-    ;------------------------------ JITTER BUFFER CONFIGURATION --------------------------
-    ; jbenable = yes              ; Enables the use of a jitterbuffer on the receiving side of an
-                                  ; USBRADIO channel. Defaults to "no". An enabled jitterbuffer will
-                                  ; be used only if the sending side can create and the receiving
-                                  ; side can not accept jitter. The USBRADIO channel can't accept jitter,
-                                  ; thus an enabled jitterbuffer on the receive USBRADIO side will always
-                                  ; be used if the sending side can create jitter.
-
-    ; jbmaxsize = 200             ; Max length of the jitterbuffer in milliseconds.
-
-    ; jbresyncthreshold = 1000    ; Jump in the frame timestamps over which the jitterbuffer is
-                                  ; resynchronized. Useful to improve the quality of the voice, with
-                                  ; big jumps in/broken timestamps, usualy sent from exotic devices
-                                  ; and programs. Defaults to 1000.
-
-    ; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of an USBRADIO
-                                  ; channel. Two implementations are currenlty available - "fixed"
-                                  ; (with size always equals to jbmax-size) and "adaptive" (with
-                                  ; variable size, actually the new jb of IAX2). Defaults to fixed.
-
-    ; jblog = no                  ; Enables jitterbuffer frame logging. Defaults to "no".
-    ;-----------------------------------------------------------------------------------
-
-[usb]
-
-; First channel unique config
-
-[usb1]
-
-; Second channel config
-
-END_CONFIG
-
- */
-
-/*
- * Helper macros to parse config arguments. They will go in a common
- * header file if their usage is globally accepted. In the meantime,
- * we define them here. Typical usage is as below.
- * Remember to open a block right before M_START (as it declares
- * some variables) and use the M_* macros WITHOUT A SEMICOLON:
- *
- *	{
- *		M_START(v->name, v->value) 
- *
- *		M_BOOL("dothis", x->flag1)
- *		M_STR("name", x->somestring)
- *		M_F("bar", some_c_code)
- *		M_END(some_final_statement)
- *		... other code in the block
- *	}
- *
- * XXX NOTE these macros should NOT be replicated in other parts of asterisk. 
- * Likely we will come up with a better way of doing config file parsing.
- */
-#define M_START(var, val) \
-        char *__s = var; char *__val = val;
-#define M_END(x)   x;
-#define M_F(tag, f)			if (!strcasecmp((__s), tag)) { f; } else
-#define M_BOOL(tag, dst)	M_F(tag, (dst) = ast_true(__val) )
-#define M_UINT(tag, dst)	M_F(tag, (dst) = strtoul(__val, NULL, 0) )
-#define M_STR(tag, dst)		M_F(tag, ast_copy_string(dst, __val, sizeof(dst)))
-
-/*
- * The following parameters are used in the driver:
- *
- *  FRAME_SIZE	the size of an audio frame, in samples.
- *		160 is used almost universally, so you should not change it.
- *
- *  FRAGS	the argument for the SETFRAGMENT ioctl.
- *		Overridden by the 'frags' parameter in usbradio.conf
- *
- *		Bits 0-7 are the base-2 log of the device's block size,
- *		bits 16-31 are the number of blocks in the driver's queue.
- *		There are a lot of differences in the way this parameter
- *		is supported by different drivers, so you may need to
- *		experiment a bit with the value.
- *		A good default for linux is 30 blocks of 64 bytes, which
- *		results in 6 frames of 320 bytes (160 samples).
- *		FreeBSD works decently with blocks of 256 or 512 bytes,
- *		leaving the number unspecified.
- *		Note that this only refers to the device buffer size,
- *		this module will then try to keep the lenght of audio
- *		buffered within small constraints.
- *
- *  QUEUE_SIZE	The max number of blocks actually allowed in the device
- *		driver's buffer, irrespective of the available number.
- *		Overridden by the 'queuesize' parameter in usbradio.conf
- *
- *		Should be >=2, and at most as large as the hw queue above
- *		(otherwise it will never be full).
- */
-
-#define FRAME_SIZE	160
-#define	QUEUE_SIZE	2				
-
-#if defined(__FreeBSD__)
-#define	FRAGS	0x8
-#else
-#define	FRAGS	( ( (6 * 5) << 16 ) | 0xc )
-#endif
-
-/*
- * XXX text message sizes are probably 256 chars, but i am
- * not sure if there is a suitable definition anywhere.
- */
-#define TEXT_SIZE	256
-
-#if 0
-#define	TRYOPEN	1				/* try to open on startup */
-#endif
-#define	O_CLOSE	0x444			/* special 'close' mode for device */
-/* Which device to use */
-#if defined( __OpenBSD__ ) || defined( __NetBSD__ )
-#define DEV_DSP "/dev/audio"
-#else
-#define DEV_DSP "/dev/dsp"
-#endif
-
-static const char *config = "usbradio.conf";	/* default config file */
-#define config1 "usbradio_tune_%s.conf"    /* tune config file */
-
-static FILE *frxcapraw = NULL, *frxcaptrace = NULL, *frxoutraw = NULL;
-static FILE *ftxcapraw = NULL, *ftxcaptrace = NULL, *ftxoutraw = NULL;
-
-static char *usb_device_list = NULL;
-static int usb_device_list_size = 0;
-
-static int usbradio_debug;
-#if 0 //maw asdf sph
-static int usbradio_debug_level = 0;
-#endif
-
-enum {RX_AUDIO_NONE,RX_AUDIO_SPEAKER,RX_AUDIO_FLAT};
-enum {CD_IGNORE,CD_XPMR_NOISE,CD_XPMR_VOX,CD_HID,CD_HID_INVERT};
-enum {SD_IGNORE,SD_HID,SD_HID_INVERT,SD_XPMR};    				 // no,external,externalinvert,software
-enum {RX_KEY_CARRIER,RX_KEY_CARRIER_CODE};
-enum {TX_OUT_OFF,TX_OUT_VOICE,TX_OUT_LSD,TX_OUT_COMPOSITE,TX_OUT_AUX};
-enum {TOC_NONE,TOC_PHASE,TOC_NOTONE};
-
-/*	DECLARE STRUCTURES */
-
-/*
- * Each sound is made of 'datalen' samples of sound, repeated as needed to
- * generate 'samplen' samples of data, then followed by 'silencelen' samples
- * of silence. The loop is repeated if 'repeat' is set.
- */
-struct sound {
-	int ind;
-	short *data;
-	int datalen;
-	int samplen;
-	int silencelen;
-	int repeat;
-};
-
-#ifndef	NEW_ASTERISK
-
-static struct sound sounds[] = {
-	{ AST_CONTROL_RINGING, "RINGING", ringtone, sizeof(ringtone)/2, 16000, 32000, 1 },
-	{ AST_CONTROL_BUSY, "BUSY", busy, sizeof(busy)/2, 4000, 4000, 1 },
-	{ AST_CONTROL_CONGESTION, "CONGESTION", busy, sizeof(busy)/2, 2000, 2000, 1 },
-	{ AST_CONTROL_RING, "RING10", ring10, sizeof(ring10)/2, 16000, 32000, 1 },
-	{ AST_CONTROL_ANSWER, "ANSWER", answer, sizeof(answer)/2, 2200, 0, 0 },
-	{ -1, NULL, 0, 0, 0, 0 },	/* end marker */
-};
-
-#endif
-
-/*
- * descriptor for one of our channels.
- * There is one used for 'default' values (from the [general] entry in
- * the configuration file), and then one instance for each device
- * (the default is cloned from [general], others are only created
- * if the relevant section exists).
- */
-struct chan_usbradio_pvt {
-	struct chan_usbradio_pvt *next;
-
-	char *name;
-#ifndef	NEW_ASTERISK
-	/*
-	 * cursound indicates which in struct sound we play. -1 means nothing,
-	 * any other value is a valid sound, in which case sampsent indicates
-	 * the next sample to send in [0..samplen + silencelen]
-	 * nosound is set to disable the audio data from the channel
-	 * (so we can play the tones etc.).
-	 */
-	int sndcmd[2];				/* Sound command pipe */
-	int cursound;				/* index of sound to send */
-	int sampsent;				/* # of sound samples sent  */
-	int nosound;				/* set to block audio from the PBX */
-#endif
-
-	int pttkick[2];
-	int total_blocks;			/* total blocks in the output device */
-	int sounddev;
-	enum { M_UNSET, M_FULL, M_READ, M_WRITE } duplex;
-	i16 cdMethod;
-	int autoanswer;
-	int autohangup;
-	int hookstate;
-	unsigned int queuesize;		/* max fragments in queue */
-	unsigned int frags;			/* parameter for SETFRAGMENT */
-
-	int warned;					/* various flags used for warnings */
-#define WARN_used_blocks	1
-#define WARN_speed		2
-#define WARN_frag		4
-	int w_errors;				/* overfull in the write path */
-	struct timeval lastopen;
-
-	int overridecontext;
-	int mute;
-
-	/* boost support. BOOST_SCALE * 10 ^(BOOST_MAX/20) must
-	 * be representable in 16 bits to avoid overflows.
-	 */
-#define	BOOST_SCALE	(1<<9)
-#define	BOOST_MAX	40			/* slightly less than 7 bits */
-	int boost;					/* input boost, scaled by BOOST_SCALE */
-	char devicenum;
-	char devstr[128];
-	int spkrmax;
-	int micmax;
-
-#ifndef	NEW_ASTERISK
-	pthread_t sthread;
-#endif
-	pthread_t hidthread;
-
-	int stophid;
-	FILE *hkickhid;
-
-	struct ast_channel *owner;
-	char ext[AST_MAX_EXTENSION];
-	char ctx[AST_MAX_CONTEXT];
-	char language[MAX_LANGUAGE];
-	char cid_name[256];			/*XXX */
-	char cid_num[256];			/*XXX */
-	char mohinterpret[MAX_MUSICCLASS];
-
-	/* buffers used in usbradio_write, 2 per int by 2 channels by 6 times oversampling (48KS/s) */
-	char usbradio_write_buf[FRAME_SIZE * 2 * 2 * 6];    
-	char usbradio_write_buf_1[FRAME_SIZE * 2 * 2* 6];
-
-	int usbradio_write_dst;
-	/* buffers used in usbradio_read - AST_FRIENDLY_OFFSET space for headers
-	 * plus enough room for a full frame
-	 */
-	char usbradio_read_buf[FRAME_SIZE * (2 * 12) + AST_FRIENDLY_OFFSET];
-	char usbradio_read_buf_8k[FRAME_SIZE * 2 + AST_FRIENDLY_OFFSET];
-	int readpos;				/* read position above */
-	struct ast_frame read_f;	/* returned by usbradio_read */
-
-	char 	debuglevel;
-	char 	radioduplex;			// 
-	char    wanteeprom;
-
-	int  	tracetype;
-	int     tracelevel;
-	char    area;
-	char 	rptnum;
-	int     idleinterval;
-	int		turnoffs;
-	int  	txsettletime;
-	char    ukey[48];
-
-	char lastrx;
-	char rxhidsq;
-	char rxcarrierdetect;		// status from pmr channel
-	char rxctcssdecode;			// status from pmr channel
-
-	int  rxdcsdecode;
-	int  rxlsddecode;
-
-	char rxkeytype;
-	char rxkeyed;	  			// indicates rx signal present
-
-	char lasttx;
-	char txkeyed;				// tx key request from upper layers 
-	char txchankey;
-	char txtestkey;
-
-	time_t lasthidtime;
-    struct ast_dsp *dsp;
-
-	t_pmr_chan	*pmrChan;
-
-	char    rxcpusaver;
-	char    txcpusaver;
-
-	char	rxdemod;
-	float	rxgain;
-	char 	rxcdtype;
-	char 	rxsdtype;
-	int		rxsquelchadj;   /* this copy needs to be here for initialization */
-	int     rxsqvoxadj;
-	char	txtoctype;
-
-	char    txprelim;
-	float	txctcssgain;
-	char 	txmixa;
-	char 	txmixb;
-
-	char	invertptt;
-
-	char	rxctcssrelax;
-	float	rxctcssgain;
-
-	char    txctcssdefault[16];				// for repeater operation
-	char	rxctcssfreqs[512];				// a string
-	char    txctcssfreqs[512];
-
-	char	txctcssfreq[32];				// encode now
-	char	rxctcssfreq[32];				// decode now
-
-	char    numrxctcssfreqs;	  			// how many
-	char    numtxctcssfreqs;
-
-	char    *rxctcss[CTCSS_NUM_CODES]; 		// pointers to strings
-	char    *txctcss[CTCSS_NUM_CODES];
-
-	int   	txfreq;			 				// in Hz
-	int     rxfreq;
-
-	// 		start remote operation info
-	char    set_txctcssdefault[16];				// for remote operation
-	char	set_txctcssfreq[16];				// encode now
-	char	set_rxctcssfreq[16];				// decode now
-
-	char    set_numrxctcssfreqs;	  			// how many
-	char    set_numtxctcssfreqs;
-
-	char	set_rxctcssfreqs[16];				// a string
-	char    set_txctcssfreqs[16];
-
-	char    *set_rxctcss; 					    // pointers to strings
-	char    *set_txctcss;
-
-	int   	set_txfreq;			 				// in Hz
-	int     set_rxfreq;
-	// 		end remote operation info
-
-	int	   	rxmixerset;	   	
-	int 	rxboostset;
-	float	rxvoiceadj;
-	float	rxctcssadj;
-	int 	txmixaset;
-	int 	txmixbset;
-	int     txctcssadj;
-
-	int    	hdwtype;
-	int		hid_gpio_ctl;		
-	int		hid_gpio_ctl_loc;	
-	int		hid_io_cor; 		
-	int		hid_io_cor_loc; 	
-	int		hid_io_ctcss;		
-	int		hid_io_ctcss_loc; 	
-	int		hid_io_ptt; 		
-	int		hid_gpio_loc; 		
-
-	struct {
-	    unsigned rxcapraw:1;
-		unsigned txcapraw:1;
-		unsigned txcap2:1;
-		unsigned rxcap2:1;
-		unsigned rxplmon:1;
-		unsigned remoted:1;
-		unsigned txpolarity:1;
-		unsigned rxpolarity:1;
-		unsigned dcstxpolarity:1;
-		unsigned dcsrxpolarity:1;
-		unsigned lsdtxpolarity:1;
-		unsigned lsdrxpolarity:1;
-		unsigned loopback:1;
-		unsigned radioactive:1;
-	}b;
-	unsigned short eeprom[EEPROM_PHYSICAL_LEN];
-	char eepromctl;
-	ast_mutex_t eepromlock;
-
-	struct usb_dev_handle *usb_handle;
-	int readerrs;
-};
-
-// maw add additional defaults !!!
-static struct chan_usbradio_pvt usbradio_default = {
-#ifndef	NEW_ASTERISK
-	.cursound = -1,
-#endif
-	.sounddev = -1,
-	.duplex = M_UNSET,			/* XXX check this */
-	.autoanswer = 1,
-	.autohangup = 1,
-	.queuesize = QUEUE_SIZE,
-	.frags = FRAGS,
-	.ext = "s",
-	.ctx = "default",
-	.readpos = AST_FRIENDLY_OFFSET,	/* start here on reads */
-	.lastopen = { 0, 0 },
-	.boost = BOOST_SCALE,
-	.wanteeprom = 1,
-	.area = 0,
-	.rptnum = 0,
-};
-
-/*	DECLARE FUNCTION PROTOTYPES	*/
-
-static void store_txtoctype(struct chan_usbradio_pvt *o, const char *s);
-static int	hidhdwconfig(struct chan_usbradio_pvt *o);
-static int set_txctcss_level(struct chan_usbradio_pvt *o);
-static void pmrdump(struct chan_usbradio_pvt *o);
-static void mult_set(struct chan_usbradio_pvt *o);
-static int  mult_calc(int value);
-static void mixer_write(struct chan_usbradio_pvt *o);
-static void tune_rxinput(int fd, struct chan_usbradio_pvt *o);
-static void tune_rxvoice(int fd, struct chan_usbradio_pvt *o);
-static void tune_rxctcss(int fd, struct chan_usbradio_pvt *o);
-static void tune_txoutput(struct chan_usbradio_pvt *o, int value, int fd);
-static void tune_write(struct chan_usbradio_pvt *o);
-
-static char *usbradio_active;	 /* the active device */
-
-static int setformat(struct chan_usbradio_pvt *o, int mode);
-
-static struct ast_channel *usbradio_request(const char *type, struct ast_format_cap *cap,
-		const struct ast_channel *requestor,
-		const char *data, int *cause);
-static int usbradio_digit_begin(struct ast_channel *c, char digit);
-static int usbradio_digit_end(struct ast_channel *c, char digit, unsigned int duration);
-static int usbradio_text(struct ast_channel *c, const char *text);
-static int usbradio_hangup(struct ast_channel *c);
-static int usbradio_answer(struct ast_channel *c);
-static struct ast_frame *usbradio_read(struct ast_channel *chan);
-static int usbradio_call(struct ast_channel *c, const char *dest, int timeout);
-static int usbradio_write(struct ast_channel *chan, struct ast_frame *f);
-static int usbradio_indicate(struct ast_channel *chan, int cond, const void *data, size_t datalen);
-static int usbradio_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
-static int xpmr_config(struct chan_usbradio_pvt *o);
-
-#if	DEBUG_FILETEST == 1
-static int RxTestIt(struct chan_usbradio_pvt *o);
-#endif
-
-static char tdesc[] = "USB (CM108) Radio Channel Driver";
-
-static struct ast_format slin;
-
-static struct ast_channel_tech usbradio_tech = {
-	.type = "Radio",
-	.description = tdesc,
-	.requester = usbradio_request,
-	.send_digit_begin = usbradio_digit_begin,
-	.send_digit_end = usbradio_digit_end,
-	.send_text = usbradio_text,
-	.hangup = usbradio_hangup,
-	.answer = usbradio_answer,
-	.read = usbradio_read,
-	.call = usbradio_call,
-	.write = usbradio_write,
-	.indicate = usbradio_indicate,
-	.fixup = usbradio_fixup,
-};
-
-/* Call with:  devnum: alsa major device number, param: ascii Formal
-Parameter Name, val1, first or only value, val2 second value, or 0 
-if only 1 value. Values: 0-99 (percent) or 0-1 for baboon.
-
-Note: must add -lasound to end of linkage */
-
-static int amixer_max(int devnum,char *param)
-{
-int	rv,type;
-char	str[100];
-snd_hctl_t *hctl;
-snd_ctl_elem_id_t *id;
-snd_hctl_elem_t *elem;
-snd_ctl_elem_info_t *info;
-
-	sprintf(str,"hw:%d",devnum);
-	if (snd_hctl_open(&hctl, str, 0)) return(-1);
-	snd_hctl_load(hctl);
-	snd_ctl_elem_id_alloca(&id);
-	snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER);
-	snd_ctl_elem_id_set_name(id, param);  
-	elem = snd_hctl_find_elem(hctl, id);
-	if (!elem)
-	{
-		snd_hctl_close(hctl);
-		return(-1);
-	}
-	snd_ctl_elem_info_alloca(&info);
-	snd_hctl_elem_info(elem,info);
-	type = snd_ctl_elem_info_get_type(info);
-	rv = 0;
-	switch(type)
-	{
-	    case SND_CTL_ELEM_TYPE_INTEGER:
-		rv = snd_ctl_elem_info_get_max(info);
-		break;
-	    case SND_CTL_ELEM_TYPE_BOOLEAN:
-		rv = 1;
-		break;
-	}
-	snd_hctl_close(hctl);
-	return(rv);
-}
-
-/* Call with:  devnum: alsa major device number, param: ascii Formal
-Parameter Name, val1, first or only value, val2 second value, or 0 
-if only 1 value. Values: 0-99 (percent) or 0-1 for baboon.
-
-Note: must add -lasound to end of linkage */
-
-static int setamixer(int devnum,char *param, int v1, int v2)
-{
-int	type;
-char	str[100];
-snd_hctl_t *hctl;
-snd_ctl_elem_id_t *id;
-snd_ctl_elem_value_t *control;
-snd_hctl_elem_t *elem;
-snd_ctl_elem_info_t *info;
-
-	sprintf(str,"hw:%d",devnum);
-	if (snd_hctl_open(&hctl, str, 0)) return(-1);
-	snd_hctl_load(hctl);
-	snd_ctl_elem_id_alloca(&id);
-	snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER);
-	snd_ctl_elem_id_set_name(id, param);  
-	elem = snd_hctl_find_elem(hctl, id);
-	if (!elem)
-	{
-		snd_hctl_close(hctl);
-		return(-1);
-	}
-	snd_ctl_elem_info_alloca(&info);
-	snd_hctl_elem_info(elem,info);
-	type = snd_ctl_elem_info_get_type(info);
-	snd_ctl_elem_value_alloca(&control);
-	snd_ctl_elem_value_set_id(control, id);    
-	switch(type)
-	{
-	    case SND_CTL_ELEM_TYPE_INTEGER:
-		snd_ctl_elem_value_set_integer(control, 0, v1);
-		if (v2 > 0) snd_ctl_elem_value_set_integer(control, 1, v2);
-		break;
-	    case SND_CTL_ELEM_TYPE_BOOLEAN:
-		snd_ctl_elem_value_set_integer(control, 0, (v1 != 0));
-		break;
-	}
-	if (snd_hctl_elem_write(elem, control))
-	{
-		snd_hctl_close(hctl);
-		return(-1);
-	}
-	snd_hctl_close(hctl);
-	return(0);
-}
-
-static void hid_set_outputs(struct usb_dev_handle *handle,
-         unsigned char *outputs)
-{
-	usleep(1500);
-	usb_control_msg(handle,
-	      USB_ENDPOINT_OUT + USB_TYPE_CLASS + USB_RECIP_INTERFACE,
-	      HID_REPORT_SET,
-	      0 + (HID_RT_OUTPUT << 8),
-	      C108_HID_INTERFACE,
-	      (char*)outputs, 4, 5000);
-}
-
-static void hid_get_inputs(struct usb_dev_handle *handle,
-         unsigned char *inputs)
-{
-	usleep(1500);
-	usb_control_msg(handle,
-	      USB_ENDPOINT_IN + USB_TYPE_CLASS + USB_RECIP_INTERFACE,
-	      HID_REPORT_GET,
-	      0 + (HID_RT_INPUT << 8),
-	      C108_HID_INTERFACE,
-	      (char*)inputs, 4, 5000);
-}
-
-static unsigned short read_eeprom(struct usb_dev_handle *handle, int addr)
-{
-	unsigned char buf[4];
-
-	buf[0] = 0x80;
-	buf[1] = 0;
-	buf[2] = 0;
-	buf[3] = 0x80 | (addr & 0x3f);
-	hid_set_outputs(handle,buf);
-	memset(buf,0,sizeof(buf));
-	hid_get_inputs(handle,buf);
-	return(buf[1] + (buf[2] << 8));
-}
-
-static void write_eeprom(struct usb_dev_handle *handle, int addr, 
-   unsigned short data)
-{
-
-	unsigned char buf[4];
-
-	buf[0] = 0x80;
-	buf[1] = data & 0xff;
-	buf[2] = data >> 8;
-	buf[3] = 0xc0 | (addr & 0x3f);
-	hid_set_outputs(handle,buf);
-}
-
-static unsigned short get_eeprom(struct usb_dev_handle *handle,
-	unsigned short *buf)
-{
-int	i;
-unsigned short cs;
-
-	cs = 0xffff;
-	for(i = EEPROM_START_ADDR; i < EEPROM_END_ADDR; i++)
-	{
-		cs += buf[i] = read_eeprom(handle,i);
-	}
-	return(cs);
-}
-
-static void put_eeprom(struct usb_dev_handle *handle,unsigned short *buf)
-{
-int	i;
-unsigned short cs;
-
-	cs = 0xffff;
-	buf[EEPROM_MAGIC_ADDR] = EEPROM_MAGIC;
-	for(i = EEPROM_START_ADDR; i < EEPROM_CS_ADDR; i++)
-	{
-		write_eeprom(handle,i,buf[i]);
-		cs += buf[i];
-	}
-	buf[EEPROM_CS_ADDR] = (65535 - cs) + 1;
-	write_eeprom(handle,i,buf[EEPROM_CS_ADDR]);
-}
-
-static struct usb_device *hid_device_init(char *desired_device)
-{
-    struct usb_bus *usb_bus;
-    struct usb_device *dev;
-    char devstr[200],str[200],desdev[200],*cp;
-    int i;
-    FILE *fp;
-
-    usb_init();
-    usb_find_busses();
-    usb_find_devices();
-    for (usb_bus = usb_busses;
-         usb_bus;
-         usb_bus = usb_bus->next) {
-        for (dev = usb_bus->devices;
-             dev;
-             dev = dev->next) {
-            if ((dev->descriptor.idVendor
-                  == C108_VENDOR_ID) &&
-                (dev->descriptor.idProduct
-                  == C108_PRODUCT_ID))
-		{
-                        sprintf(devstr,"%s/%s", usb_bus->dirname,dev->filename);
-			for(i = 0; i < 32; i++)
-			{
-				sprintf(str,"/proc/asound/card%d/usbbus",i);
-				fp = fopen(str,"r");
-				if (!fp) continue;
-				if ((!fgets(desdev,sizeof(desdev) - 1,fp)) || (!desdev[0]))
-				{
-					fclose(fp);
-					continue;
-				}
-				fclose(fp);
-				if (desdev[strlen(desdev) - 1] == '\n')
-			        	desdev[strlen(desdev) -1 ] = 0;
-				if (strcasecmp(desdev,devstr)) continue;
-				if (i) sprintf(str,"/sys/class/sound/dsp%d/device",i);
-				else strcpy(str,"/sys/class/sound/dsp/device");
-				memset(desdev,0,sizeof(desdev));
-				if (readlink(str,desdev,sizeof(desdev) - 1) == -1)
-				{
-					sprintf(str,"/sys/class/sound/controlC%d/device",i);
-					memset(desdev,0,sizeof(desdev));
-					if (readlink(str,desdev,sizeof(desdev) - 1) == -1) continue;
-				}
-				cp = strrchr(desdev,'/');
-				if (cp) *cp = 0; else continue;
-				cp = strrchr(desdev,'/');
-				if (!cp) continue;
-				cp++;
-				break;
-			}
-			if (i >= 32) continue;
-                        if (!strcmp(cp,desired_device)) return dev;
-		}
-
-        }
-    }
-    return NULL;
-}
-
-static int hid_device_mklist(void)
-{
-    struct usb_bus *usb_bus;
-    struct usb_device *dev;
-    char devstr[200],str[200],desdev[200],*cp;
-    int i;
-    FILE *fp;
-
-    usb_device_list = ast_malloc(2);
-    if (!usb_device_list) return -1;
-    memset(usb_device_list,0,2);
-
-    usb_init();
-    usb_find_busses();
-    usb_find_devices();
-    for (usb_bus = usb_busses;
-         usb_bus;
-         usb_bus = usb_bus->next) {
-        for (dev = usb_bus->devices;
-             dev;
-             dev = dev->next) {
-            if ((dev->descriptor.idVendor
-                  == C108_VENDOR_ID) &&
-                (dev->descriptor.idProduct
-                  == C108_PRODUCT_ID))
-		{
-                        sprintf(devstr,"%s/%s", usb_bus->dirname,dev->filename);
-			for(i = 0;i < 32; i++)
-			{
-				sprintf(str,"/proc/asound/card%d/usbbus",i);
-				fp = fopen(str,"r");
-				if (!fp) continue;
-				if ((!fgets(desdev,sizeof(desdev) - 1,fp)) || (!desdev[0]))
-				{
-					fclose(fp);
-					continue;
-				}
-				fclose(fp);
-				if (desdev[strlen(desdev) - 1] == '\n')
-			        	desdev[strlen(desdev) -1 ] = 0;
-				if (strcasecmp(desdev,devstr)) continue;
-				if (i) sprintf(str,"/sys/class/sound/dsp%d/device",i);
-				else strcpy(str,"/sys/class/sound/dsp/device");
-				memset(desdev,0,sizeof(desdev));
-				if (readlink(str,desdev,sizeof(desdev) - 1) == -1)
-				{
-					sprintf(str,"/sys/class/sound/controlC%d/device",i);
-					memset(desdev,0,sizeof(desdev));
-					if (readlink(str,desdev,sizeof(desdev) - 1) == -1) continue;
-				}
-				cp = strrchr(desdev,'/');
-				if (cp) *cp = 0; else continue;
-				cp = strrchr(desdev,'/');
-				if (!cp) continue;
-				cp++;
-				break;
-			}
-			if (i >= 32) return -1;
-			usb_device_list = ast_realloc(usb_device_list,
-				usb_device_list_size + 2 +
-					strlen(cp));
-			if (!usb_device_list) return -1;
-			usb_device_list_size += strlen(cp) + 2;
-			i = 0;
-			while(usb_device_list[i])
-			{
-				i += strlen(usb_device_list + i) + 1;
-			}
-			strcat(usb_device_list + i,cp);
-			usb_device_list[strlen(cp) + i + 1] = 0;
-		}
-
-        }
-    }
-    return 0;
-}
-
-/* returns internal formatted string from external one */
-static int usb_get_usbdev(char *devstr)
-{
-int	i;
-char	str[200],desdev[200],*cp;
-
-	for(i = 0;i < 32; i++)
-	{
-		if (i) sprintf(str,"/sys/class/sound/dsp%d/device",i);
-		else strcpy(str,"/sys/class/sound/dsp/device");
-		memset(desdev,0,sizeof(desdev));
-		if (readlink(str,desdev,sizeof(desdev) - 1) == -1)
-		{
-			sprintf(str,"/sys/class/sound/controlC%d/device",i);
-			memset(desdev,0,sizeof(desdev));
-			if (readlink(str,desdev,sizeof(desdev) - 1) == -1) continue;
-		}
-		cp = strrchr(desdev,'/');
-		if (cp) *cp = 0; else continue;
-		cp = strrchr(desdev,'/');
-		if (!cp) continue;
-		cp++;
-		if (!strcasecmp(cp,devstr)) break;
-	}
-	if (i >= 32) return -1;
-	return i;
-
-}
-
-static int usb_list_check(char *devstr)
-{
-
-char *s = usb_device_list;
-
-	if (!s) return(0);
-	while(*s)
-	{
-		if (!strcasecmp(s,devstr)) return(1);
-		s += strlen(s) + 1;
-	}
-	return(0);
-}
-
-
-static int	hidhdwconfig(struct chan_usbradio_pvt *o)
-{
-	if(o->hdwtype==1)	  //sphusb
-	{
-		o->hid_gpio_ctl		=  0x08;	/* set GPIO4 to output mode */
-		o->hid_gpio_ctl_loc	=  2; 	/* For CTL of GPIO */
-		o->hid_io_cor		=  4;	/* GPIO3 is COR */
-		o->hid_io_cor_loc	=  1;	/* GPIO3 is COR */
-		o->hid_io_ctcss		=  2;  	/* GPIO 2 is External CTCSS */
-		o->hid_io_ctcss_loc =  1;	/* is GPIO 2 */
-		o->hid_io_ptt 		=  8;  	/* GPIO 4 is PTT */
-		o->hid_gpio_loc 	=  1;  	/* For ALL GPIO */
-	}
-	else if(o->hdwtype==0)	//dudeusb
-	{
-		o->hid_gpio_ctl		=  0x0c;	/* set GPIO 3 & 4 to output mode */
-		o->hid_gpio_ctl_loc	=  2; 	/* For CTL of GPIO */
-		o->hid_io_cor		=  2;	/* VOLD DN is COR */
-		o->hid_io_cor_loc	=  0;	/* VOL DN COR */
-		o->hid_io_ctcss		=  2;  	/* GPIO 2 is External CTCSS */
-		o->hid_io_ctcss_loc =  1;	/* is GPIO 2 */
-		o->hid_io_ptt 		=  4;  	/* GPIO 3 is PTT */
-		o->hid_gpio_loc 	=  1;  	/* For ALL GPIO */
-	}
-	else if(o->hdwtype==3)	// custom version
-	{
-		o->hid_gpio_ctl		=  0x0c;	/* set GPIO 3 & 4 to output mode */
-		o->hid_gpio_ctl_loc	=  2; 	/* For CTL of GPIO */
-		o->hid_io_cor		=  2;	/* VOLD DN is COR */
-		o->hid_io_cor_loc	=  0;	/* VOL DN COR */
-		o->hid_io_ctcss		=  2;  	/* GPIO 2 is External CTCSS */
-		o->hid_io_ctcss_loc =  1;	/* is GPIO 2 */
-		o->hid_io_ptt 		=  4;  	/* GPIO 3 is PTT */
-		o->hid_gpio_loc 	=  1;  	/* For ALL GPIO */
-	}
-
-	return 0;
-}
-/*
-*/
-static void kickptt(struct chan_usbradio_pvt *o)
-{
-	char c = 0;
-	//printf("kickptt  %i  %i  %i\n",o->txkeyed,o->txchankey,o->txtestkey);
-	if (!o) return;
-	if (!o->pttkick) return;
-	if (write(o->pttkick[1],&c,1) < 0) {
-		ast_log(LOG_ERROR, "write() failed: %s\n", strerror(errno));
-	}
-}
-/*
-*/
-static void *hidthread(void *arg)
-{
-	unsigned char buf[4],bufsave[4],keyed;
-	char txtmp;
-	int res;
-	struct usb_device *usb_dev;
-	struct usb_dev_handle *usb_handle;
-	struct chan_usbradio_pvt *o = (struct chan_usbradio_pvt *) arg;
-	struct pollfd pfd = { .events = POLLIN };
-
-	usb_dev = hid_device_init(o->devstr);
-	if (usb_dev == NULL) {
-		ast_log(LOG_ERROR,"USB HID device not found\n");
-		pthread_exit(NULL);
-	}
-	usb_handle = usb_open(usb_dev);
-	if (usb_handle == NULL) {
-	        ast_log(LOG_ERROR,"Not able to open USB device\n");
-		pthread_exit(NULL);
-	}
-	if (usb_claim_interface(usb_handle,C108_HID_INTERFACE) < 0)
-	{
-	    if (usb_detach_kernel_driver_np(usb_handle,C108_HID_INTERFACE) < 0) {
-		        ast_log(LOG_ERROR,"Not able to detach the USB device\n");
-			pthread_exit(NULL);
-		}
-		if (usb_claim_interface(usb_handle,C108_HID_INTERFACE) < 0) {
-		        ast_log(LOG_ERROR,"Not able to claim the USB device\n");
-			pthread_exit(NULL);
-		}
-	}
-	memset(buf,0,sizeof(buf));
-	buf[2] = o->hid_gpio_ctl;
-	buf[1] = 0;
-	hid_set_outputs(usb_handle,buf);
-	memcpy(bufsave,buf,sizeof(buf));
-	if (pipe(o->pttkick) == -1)
-	{
-	    ast_log(LOG_ERROR,"Not able to create pipe\n");
-		pthread_exit(NULL);
-	}
-	traceusb1(("hidthread: Starting normally on %s!!\n",o->name));
-	// popen 
-	while (!o->stophid) {
-		pfd.fd = o->pttkick[0];
-		pfd.revents = 0;
-
-		res = ast_poll(&pfd, 1, 50);
-		if (res < 0) {
-			ast_log(LOG_WARNING, "poll() failed: %s\n", strerror(errno));
-			usleep(10000);
-			continue;
-		}
-		if (pfd.revents & POLLIN) {
-			char c;
-
-			if (read(o->pttkick[0], &c, 1) < 0) {
-				ast_log(LOG_ERROR, "read() failed: %s\n", strerror(errno));
-			}
-		}
-		if (o->wanteeprom) {
-			ast_mutex_lock(&o->eepromlock);
-			if (o->eepromctl == 1) { /* to read */
-				/* if CS okay */
-				if (!get_eeprom(usb_handle, o->eeprom)) {
-					if (o->eeprom[EEPROM_MAGIC_ADDR] != EEPROM_MAGIC) {
-						ast_log(LOG_NOTICE, "UNSUCCESSFUL: EEPROM MAGIC NUMBER BAD on channel %s\n", o->name);
-					} else {
-						o->rxmixerset = o->eeprom[EEPROM_RXMIXERSET];
-						o->txmixaset = o->eeprom[EEPROM_TXMIXASET];
-						o->txmixbset = o->eeprom[EEPROM_TXMIXBSET];
-						memcpy(&o->rxvoiceadj, &o->eeprom[EEPROM_RXVOICEADJ], sizeof(float));
-						memcpy(&o->rxctcssadj, &o->eeprom[EEPROM_RXCTCSSADJ], sizeof(float));
-						o->txctcssadj = o->eeprom[EEPROM_TXCTCSSADJ];
-						o->rxsquelchadj = o->eeprom[EEPROM_RXSQUELCHADJ];
-						ast_log(LOG_NOTICE,"EEPROM Loaded on channel %s\n",o->name);
-					}
-				} else {
-					ast_log(LOG_NOTICE, "USB Adapter has no EEPROM installed or Checksum BAD on channel %s\n", o->name);
-				}
-				hid_set_outputs(usb_handle,bufsave);
-			}
-			if (o->eepromctl == 2) { /* to write */
-				put_eeprom(usb_handle,o->eeprom);
-				hid_set_outputs(usb_handle,bufsave);
-				ast_log(LOG_NOTICE, "USB Parameters written to EEPROM on %s\n", o->name);
-			}
-			o->eepromctl = 0;
-			ast_mutex_unlock(&o->eepromlock);
-		}
-		buf[o->hid_gpio_ctl_loc] = o->hid_gpio_ctl;
-		hid_get_inputs(usb_handle,buf);
-		keyed = !(buf[o->hid_io_cor_loc] & o->hid_io_cor);
-		if (keyed != o->rxhidsq) {
-			if (o->debuglevel) {
-				printf("chan_usbradio() hidthread: update rxhidsq = %d\n", keyed);
-			}
-			o->rxhidsq=keyed;
-		}
-
-		/* if change in tx state as controlled by xpmr */
-		txtmp = o->pmrChan->txPttOut;
-
-		if (o->lasttx != txtmp) {
-			o->pmrChan->txPttHid = o->lasttx = txtmp;
-			if (o->debuglevel) {
-				ast_debug(0, "hidthread: tx set to %d\n", txtmp);
-			}
-			buf[o->hid_gpio_loc] = 0;
-			if (!o->invertptt) {
-				if (txtmp) {
-					buf[o->hid_gpio_loc] = o->hid_io_ptt;
-				}
-			} else {
-				if (!txtmp) {
-					buf[o->hid_gpio_loc] = o->hid_io_ptt;
-				}
-			}
-			buf[o->hid_gpio_ctl_loc] = o->hid_gpio_ctl;
-			memcpy(bufsave, buf, sizeof(buf));
-			hid_set_outputs(usb_handle, buf);
-		}
-		time(&o->lasthidtime);
-	}
-	buf[o->hid_gpio_loc] = 0;
-	if (o->invertptt) {
-		buf[o->hid_gpio_loc] = o->hid_io_ptt;
-	}
-	buf[o->hid_gpio_ctl_loc] = o->hid_gpio_ctl;
-	hid_set_outputs(usb_handle, buf);
-	pthread_exit(0);
-}
-
-/*
- * returns a pointer to the descriptor with the given name
- */
-static struct chan_usbradio_pvt *find_desc(const char *dev)
-{
-	struct chan_usbradio_pvt *o = NULL;
-
-	if (!dev)
-		ast_log(LOG_WARNING, "null dev\n");
-
-	for (o = usbradio_default.next; o && o->name && dev && strcmp(o->name, dev) != 0; o = o->next);
-	if (!o)
-	{
-		ast_log(LOG_WARNING, "could not find <%s>\n", dev ? dev : "--no-device--");
-	}
-
-	return o;
-}
-
-static struct chan_usbradio_pvt *find_desc_usb(char *devstr)
-{
-	struct chan_usbradio_pvt *o = NULL;
-
-	if (!devstr)
-		ast_log(LOG_WARNING, "null dev\n");
-
-	for (o = usbradio_default.next; o && devstr && strcmp(o->devstr, devstr) != 0; o = o->next);
-
-	return o;
-}
-
-/*
- * split a string in extension-context, returns pointers to malloc'ed
- * strings.
- * If we do not have 'overridecontext' then the last @ is considered as
- * a context separator, and the context is overridden.
- * This is usually not very necessary as you can play with the dialplan,
- * and it is nice not to need it because you have '@' in SIP addresses.
- * Return value is the buffer address.
- */
-#if	0
-static char *ast_ext_ctx(const char *src, char **ext, char **ctx)
-{
-	struct chan_usbradio_pvt *o = find_desc(usbradio_active);
-
-	if (ext == NULL || ctx == NULL)
-		return NULL;			/* error */
-
-	*ext = *ctx = NULL;
-
-	if (src && *src != '\0')
-		*ext = ast_strdup(src);
-
-	if (*ext == NULL)
-		return NULL;
-
-	if (!o->overridecontext) {
-		/* parse from the right */
-		*ctx = strrchr(*ext, '@');
-		if (*ctx)
-			*(*ctx)++ = '\0';
-	}
-
-	return *ext;
-}
-#endif
-
-/*
- * Returns the number of blocks used in the audio output channel
- */
-static int used_blocks(struct chan_usbradio_pvt *o)
-{
-	struct audio_buf_info info;
-
-	if (ioctl(o->sounddev, SNDCTL_DSP_GETOSPACE, &info)) {
-		if (!(o->warned & WARN_used_blocks)) {
-			ast_log(LOG_WARNING, "Error reading output space\n");
-			o->warned |= WARN_used_blocks;
-		}
-		return 1;
-	}
-
-	if (o->total_blocks == 0) {
-		if (0)					/* debugging */
-			ast_log(LOG_WARNING, "fragtotal %d size %d avail %d\n", info.fragstotal, info.fragsize, info.fragments);
-		o->total_blocks = info.fragments;
-	}
-
-	return o->total_blocks - info.fragments;
-}
-
-/* Write an exactly FRAME_SIZE sized frame */
-static int soundcard_writeframe(struct chan_usbradio_pvt *o, short *data)
-{
-	int res;
-
-	if (o->sounddev < 0)
-		setformat(o, O_RDWR);
-	if (o->sounddev < 0)
-		return 0;				/* not fatal */
-	//  maw maw sph !!! may or may not be a good thing
-	//  drop the frame if not transmitting, this keeps from gradually
-	//  filling the buffer when asterisk clock > usb sound clock
-	if(!o->pmrChan->txPttIn && !o->pmrChan->txPttOut)
-	{
-		//return 0;
-	}
-	/*
-	 * Nothing complex to manage the audio device queue.
-	 * If the buffer is full just drop the extra, otherwise write.
-	 * XXX in some cases it might be useful to write anyways after
-	 * a number of failures, to restart the output chain.
-	 */
-	res = used_blocks(o);
-	if (res > o->queuesize) {	/* no room to write a block */
-	    // ast_log(LOG_WARNING, "sound device write buffer overflow\n");
-		if (o->w_errors++ == 0 && (usbradio_debug & 0x4))
-			ast_log(LOG_WARNING, "write: used %d blocks (%d)\n", res, o->w_errors);
-		return 0;
-	}
-	o->w_errors = 0;
-
-	return write(o->sounddev, ((void *) data), FRAME_SIZE * 2 * 12);
-}
-
-#ifndef	NEW_ASTERISK
-
-/*
- * Handler for 'sound writable' events from the sound thread.
- * Builds a frame from the high level description of the sounds,
- * and passes it to the audio device.
- * The actual sound is made of 1 or more sequences of sound samples
- * (s->datalen, repeated to make s->samplen samples) followed by
- * s->silencelen samples of silence. The position in the sequence is stored
- * in o->sampsent, which goes between 0 .. s->samplen+s->silencelen.
- * In case we fail to write a frame, don't update o->sampsent.
- */
-static void send_sound(struct chan_usbradio_pvt *o)
-{
-	short myframe[FRAME_SIZE];
-	int ofs, l, start;
-	int l_sampsent = o->sampsent;
-	struct sound *s;
-
-	if (o->cursound < 0)		/* no sound to send */
-		return;
-
-	s = &sounds[o->cursound];
-
-	for (ofs = 0; ofs < FRAME_SIZE; ofs += l) {
-		l = s->samplen - l_sampsent;	/* # of available samples */
-		if (l > 0) {
-			start = l_sampsent % s->datalen;	/* source offset */
-			if (l > FRAME_SIZE - ofs)	/* don't overflow the frame */
-				l = FRAME_SIZE - ofs;
-			if (l > s->datalen - start)	/* don't overflow the source */
-				l = s->datalen - start;
-			memmove(myframe + ofs, s->data + start, l * 2);
-			if (0)
-				ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs);
-			l_sampsent += l;
-		} else {				/* end of samples, maybe some silence */
-			static const short silence[FRAME_SIZE] = { 0, };
-
-			l += s->silencelen;
-			if (l > 0) {
-				if (l > FRAME_SIZE - ofs)
-					l = FRAME_SIZE - ofs;
-				memmove(myframe + ofs, silence, l * 2);
-				l_sampsent += l;
-			} else {			/* silence is over, restart sound if loop */
-				if (s->repeat == 0) {	/* last block */
-					o->cursound = -1;
-					o->nosound = 0;	/* allow audio data */
-					if (ofs < FRAME_SIZE)	/* pad with silence */
-						memmove(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2);
-				}
-				l_sampsent = 0;
-			}
-		}
-	}
-	l = soundcard_writeframe(o, myframe);
-	if (l > 0)
-		o->sampsent = l_sampsent;	/* update status */
-}
-
-static void *sound_thread(void *arg)
-{
-	char ign[4096];
-	struct chan_usbradio_pvt *o = (struct chan_usbradio_pvt *) arg;
-
-	/*
-	 * Just in case, kick the driver by trying to read from it.
-	 * Ignore errors - this read is almost guaranteed to fail.
-	 */
-	read(o->sounddev, ign, sizeof(ign));
-	for (;;) {
-		struct pollfd pfd[2] = { { .fd = o->sndcmd[0], .events = POLLIN }, { .fd = o->sounddev } };
-		int res;
-
-		if (o->cursound > -1 && o->sounddev < 0) {
-			setformat(o, O_RDWR);	/* need the channel, try to reopen */
-		} else if (o->cursound == -1 && o->owner == NULL) {
-			setformat(o, O_CLOSE);	/* can close */
-		}
-		if (o->sounddev > -1) {
-			if (!o->owner) {	/* no one owns the audio, so we must drain it */
-				pfd[1].events = POLLIN;
-			}
-			if (o->cursound > -1) {
-				pfd[1].events |= POLLOUT;
-			}
-		}
-		res = ast_poll(pfd, o->sounddev > -1 ? 2 : 1, -1);
-		if (res < 1) {
-			ast_log(LOG_WARNING, "poll failed: %s\n", strerror(errno));
-			sleep(1);
-			continue;
-		}
-		if (pfd[0].revents & POLLIN) {
-			/* read which sound to play from the pipe */
-			int i, what = -1;
-
-			read(o->sndcmd[0], &what, sizeof(what));
-			for (i = 0; sounds[i].ind != -1; i++) {
-				if (sounds[i].ind == what) {
-					o->cursound = i;
-					o->sampsent = 0;
-					o->nosound = 1;	/* block audio from pbx */
-					break;
-				}
-			}
-			if (sounds[i].ind == -1) {
-				ast_log(LOG_WARNING, "invalid sound index: %d\n", what);
-			}
-		}
-		if (o->sounddev > -1) {
-			if (pfd[1].revents & POLLIN) { /* read and ignore errors */
-				read(o->sounddev, ign, sizeof(ign)); 
-			}
-			if (pfd[1].revents & POLLOUT) {
-				send_sound(o);
-			}
-		}
-	}
-	return NULL;				/* Never reached */
-}
-
-#endif
-
-/*
- * reset and close the device if opened,
- * then open and initialize it in the desired mode,
- * trigger reads and writes so we can start using it.
- */
-static int setformat(struct chan_usbradio_pvt *o, int mode)
-{
-	int fmt, desired, res, fd;
-	char device[100];
-
-	if (o->sounddev >= 0) {
-		ioctl(o->sounddev, SNDCTL_DSP_RESET, 0);
-		close(o->sounddev);
-		o->duplex = M_UNSET;
-		o->sounddev = -1;
-	}
-	if (mode == O_CLOSE)		/* we are done */
-		return 0;
-	o->lastopen = ast_tvnow();
-	strcpy(device,"/dev/dsp");
-	if (o->devicenum)
-		sprintf(device,"/dev/dsp%d",o->devicenum);
-	fd = o->sounddev = open(device, mode | O_NONBLOCK);
-	if (fd < 0) {
-		ast_log(LOG_WARNING, "Unable to re-open DSP device %d: %s\n", o->devicenum, strerror(errno));
-		return -1;
-	}
-	if (o->owner) {
-		ast_channel_internal_fd_set(o->owner, 0, fd);
-	}
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	fmt = AFMT_S16_LE;
-#else
-	fmt = AFMT_S16_BE;
-#endif
-	res = ioctl(fd, SNDCTL_DSP_SETFMT, &fmt);
-	if (res < 0) {
-		ast_log(LOG_WARNING, "Unable to set format to 16-bit signed\n");
-		return -1;
-	}
-	switch (mode) {
-		case O_RDWR:
-			res = ioctl(fd, SNDCTL_DSP_SETDUPLEX, 0);
-			/* Check to see if duplex set (FreeBSD Bug) */
-			res = ioctl(fd, SNDCTL_DSP_GETCAPS, &fmt);
-			if (res == 0 && (fmt & DSP_CAP_DUPLEX)) {
-				ast_verb(2, "Console is full duplex\n");
-				o->duplex = M_FULL;
-			};
-			break;
-		case O_WRONLY:
-			o->duplex = M_WRITE;
-			break;
-		case O_RDONLY:
-			o->duplex = M_READ;
-			break;
-	}
-
-	fmt = 1;
-	res = ioctl(fd, SNDCTL_DSP_STEREO, &fmt);
-	if (res < 0) {
-		ast_log(LOG_WARNING, "Failed to set audio device to mono\n");
-		return -1;
-	}
-	fmt = desired = 48000;							/* 8000 Hz desired */
-	res = ioctl(fd, SNDCTL_DSP_SPEED, &fmt);
-
-	if (res < 0) {
-		ast_log(LOG_WARNING, "Failed to set audio device to mono\n");
-		return -1;
-	}
-	if (fmt != desired) {
-		if (!(o->warned & WARN_speed)) {
-			ast_log(LOG_WARNING,
-			    "Requested %d Hz, got %d Hz -- sound may be choppy\n",
-			    desired, fmt);
-			o->warned |= WARN_speed;
-		}
-	}
-	/*
-	 * on Freebsd, SETFRAGMENT does not work very well on some cards.
-	 * Default to use 256 bytes, let the user override
-	 */
-	if (o->frags) {
-		fmt = o->frags;
-		res = ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &fmt);
-		if (res < 0) {
-			if (!(o->warned & WARN_frag)) {
-				ast_log(LOG_WARNING,
-					"Unable to set fragment size -- sound may be choppy\n");
-				o->warned |= WARN_frag;
-			}
-		}
-	}
-	/* on some cards, we need SNDCTL_DSP_SETTRIGGER to start outputting */
-	res = PCM_ENABLE_INPUT | PCM_ENABLE_OUTPUT;
-	res = ioctl(fd, SNDCTL_DSP_SETTRIGGER, &res);
-	/* it may fail if we are in half duplex, never mind */
-	return 0;
-}
-
-/*
- * some of the standard methods supported by channels.
- */
-static int usbradio_digit_begin(struct ast_channel *c, char digit)
-{
-	return 0;
-}
-
-static int usbradio_digit_end(struct ast_channel *c, char digit, unsigned int duration)
-{
-	/* no better use for received digits than print them */
-	ast_verbose(" << Console Received digit %c of duration %u ms >> \n", 
-		digit, duration);
-	return 0;
-}
-/*
-	SETFREQ - sets spi programmable xcvr
-	SETCHAN - sets binary parallel xcvr
-*/
-static int usbradio_text(struct ast_channel *c, const char *text)
-{
-	struct chan_usbradio_pvt *o = find_desc(usbradio_active);
-	double tx,rx;
-	char cnt,rxs[16],txs[16],txpl[16],rxpl[16];
-	char pwr,*cmd;
-
-	cmd = alloca(strlen(text) + 10);
-
-	/* print received messages */
-	if(o->debuglevel)ast_verbose(" << Console Received usbradio text %s >> \n", text);
-
-	cnt = sscanf(text, "%300s %15s %15s %15s %15s %1c", cmd, rxs, txs, rxpl, txpl, &pwr);
-
-	if (strcmp(cmd,"SETCHAN")==0)
-    { 
-		u8 chan;
-		chan=strtod(rxs,NULL);
-		ppbinout(chan);
-        if(o->debuglevel)ast_log(LOG_NOTICE,"parse usbradio SETCHAN cmd: %s chan: %i\n",text,chan);
-        return 0;
-    }
-	
-    if (cnt < 6)
-    {
-	    ast_log(LOG_ERROR,"Cannot parse usbradio text: %s\n",text);
-	    return 0;
-    }
-	else
-	{
-		if(o->debuglevel)ast_verbose(" << %s %s %s %s %s %c >> \n", cmd,rxs,txs,rxpl,txpl,pwr);	
-	}
-    
-    if (strcmp(cmd,"SETFREQ")==0)
-    {
-        if(o->debuglevel)ast_log(LOG_NOTICE,"parse usbradio SETFREQ cmd: %s\n",text);
-		tx=strtod(txs,NULL);
-		rx=strtod(rxs,NULL);
-		o->set_txfreq = round(tx * (double)1000000);
-		o->set_rxfreq = round(rx * (double)1000000);
-		o->pmrChan->txpower = (pwr == 'H');
-		strcpy(o->set_rxctcssfreqs,rxpl);
-		strcpy(o->set_txctcssfreqs,txpl);
-	
-		o->b.remoted=1;
-		xpmr_config(o);
-        return 0;
-    }
-	ast_log(LOG_ERROR,"Cannot parse usbradio cmd: %s\n",text);
-	return 0;
-}
-
-/* Play ringtone 'x' on device 'o' */
-static void ring(struct chan_usbradio_pvt *o, int x)
-{
-#ifndef	NEW_ASTERISK
-	write(o->sndcmd[1], &x, sizeof(x));
-#endif
-}
-
-/*
- * handler for incoming calls. Either autoanswer, or start ringing
- */
-static int usbradio_call(struct ast_channel *c, const char *dest, int timeout)
-{
-	struct chan_usbradio_pvt *o = ast_channel_tech_pvt(c);
-
-	o->stophid = 0;
-	time(&o->lasthidtime);
-	ast_pthread_create_background(&o->hidthread, NULL, hidthread, o);
-	ast_setstate(c, AST_STATE_UP);
-	return 0;
-}
-
-/*
- * remote side answered the phone
- */
-static int usbradio_answer(struct ast_channel *c)
-{
-#ifndef	NEW_ASTERISK
-	struct chan_usbradio_pvt *o = ast_channel_tech_pvt(c);
-#endif
-
-	ast_setstate(c, AST_STATE_UP);
-#ifndef	NEW_ASTERISK
-	o->cursound = -1;
-	o->nosound = 0;
-#endif
-	return 0;
-}
-
-static int usbradio_hangup(struct ast_channel *c)
-{
-	struct chan_usbradio_pvt *o = ast_channel_tech_pvt(c);
-
-	//ast_log(LOG_NOTICE, "usbradio_hangup()\n");
-#ifndef	NEW_ASTERISK
-	o->cursound = -1;
-	o->nosound = 0;
-#endif
-	ast_channel_tech_pvt_set(c, NULL);
-	o->owner = NULL;
-	ast_module_unref(ast_module_info->self);
-	if (o->hookstate) {
-		if (o->autoanswer || o->autohangup) {
-			/* Assume auto-hangup too */
-			o->hookstate = 0;
-			setformat(o, O_CLOSE);
-		} else {
-			/* Make congestion noise */
-			ring(o, AST_CONTROL_CONGESTION);
-		}
-	}
-	o->stophid = 1;
-	pthread_join(o->hidthread,NULL);
-	return 0;
-}
-
-
-/* used for data coming from the network */
-static int usbradio_write(struct ast_channel *c, struct ast_frame *f)
-{
-	struct chan_usbradio_pvt *o = ast_channel_tech_pvt(c);
-
-	traceusb2(("usbradio_write() o->nosound= %i\n",o->nosound));
-
-#ifndef	NEW_ASTERISK
-	/* Immediately return if no sound is enabled */
-	if (o->nosound)
-		return 0;
-	/* Stop any currently playing sound */
-	o->cursound = -1;
-#endif
-	/*
-	 * we could receive a block which is not a multiple of our
-	 * FRAME_SIZE, so buffer it locally and write to the device
-	 * in FRAME_SIZE chunks.
-	 * Keep the residue stored for future use.
-	 */
-
-	#if DEBUG_CAPTURES == 1	// to write input data to a file   datalen=320
-	if (ftxcapraw && o->b.txcapraw)
-	{
-		i16 i, tbuff[f->datalen];
-		for(i=0;i<f->datalen;i+=2)
-		{
-			tbuff[i]= ((i16*)(f->data.ptr))[i/2];
-			tbuff[i+1]= o->txkeyed*M_Q13;
-		}
-		if (fwrite(tbuff,2,f->datalen,ftxcapraw) != f->datalen) {
-			ast_log(LOG_ERROR, "write() failed: %s\n", strerror(errno));
-		}
-		//fwrite(f->data,1,f->datalen,ftxcapraw);
-	}
-	#endif
-
-	// maw just take the data from the network and save it for PmrRx processing
-
-	PmrTx(o->pmrChan,(i16*)f->data.ptr);
-	
-	return 0;
-}
-
-static struct ast_frame *usbradio_read(struct ast_channel *c)
-{
-	int res, src, datalen, oldpttout;
-	int cd,sd;
-	struct chan_usbradio_pvt *o = ast_channel_tech_pvt(c);
-	struct ast_frame *f = &o->read_f,*f1;
-	struct ast_frame wf = { AST_FRAME_CONTROL };
-	time_t now;
-
-	traceusb2(("usbradio_read()\n"));
-
-	if (o->lasthidtime)
-	{
-		time(&now);
-		if ((now - o->lasthidtime) > 3)
-		{
-			ast_log(LOG_ERROR,"HID process has died or something!!\n");
-			return NULL;
-		}
-	}
-	/* XXX can be simplified returning &ast_null_frame */
-	/* prepare a NULL frame in case we don't have enough data to return */
-	memset(f, '\0', sizeof(struct ast_frame));
-	f->frametype = AST_FRAME_NULL;
-	f->src = usbradio_tech.type;
-
-	res = read(o->sounddev, o->usbradio_read_buf + o->readpos, 
-		sizeof(o->usbradio_read_buf) - o->readpos);
-	if (res < 0)				/* audio data not ready, return a NULL frame */
-	{
-		if (errno != EAGAIN) return NULL;
-		if (o->readerrs++ > READERR_THRESHOLD)
-		{
-			ast_log(LOG_ERROR,"Stuck USB read channel [%s], un-sticking it!\n",o->name);
-			o->readerrs = 0;
-			return NULL;
-		}
-		if (o->readerrs == 1) 
-			ast_log(LOG_WARNING,"Possibly stuck USB read channel. [%s]\n",o->name);
-		return f;
-	}
-	if (o->readerrs) ast_log(LOG_WARNING,"Nope, USB read channel [%s] wasn't stuck after all.\n",o->name);
-	o->readerrs = 0;
-	o->readpos += res;
-	if (o->readpos < sizeof(o->usbradio_read_buf))	/* not enough samples */
-		return f;
-
-	if (o->mute)
-		return f;
-
-	#if DEBUG_CAPTURES == 1
-	if ((o->b.rxcapraw && frxcapraw) && (fwrite((o->usbradio_read_buf + AST_FRIENDLY_OFFSET),1,FRAME_SIZE * 2 * 2 * 6,frxcapraw) != FRAME_SIZE * 2 * 2 * 6)) {
-		ast_log(LOG_ERROR, "fwrite() failed: %s\n", strerror(errno));
-	}
-	#endif
-
-	#if 1
-	if(o->txkeyed||o->txtestkey)
-	{
-		if(!o->pmrChan->txPttIn)
-		{
-			o->pmrChan->txPttIn=1;
-			if(o->debuglevel) ast_log(LOG_NOTICE,"txPttIn = %i, chan %s\n",o->pmrChan->txPttIn,ast_channel_name(o->owner));
-		}
-	}
-	else if(o->pmrChan->txPttIn)
-	{
-		o->pmrChan->txPttIn=0;
-		if(o->debuglevel) ast_log(LOG_NOTICE,"txPttIn = %i, chan %s\n",o->pmrChan->txPttIn,ast_channel_name(o->owner));
-	}
-	oldpttout = o->pmrChan->txPttOut;
-
-	PmrRx(         o->pmrChan, 
-		   (i16 *)(o->usbradio_read_buf + AST_FRIENDLY_OFFSET),
-		   (i16 *)(o->usbradio_read_buf_8k + AST_FRIENDLY_OFFSET),
-		   (i16 *)(o->usbradio_write_buf_1));
-
-	if (oldpttout != o->pmrChan->txPttOut)
-	{
-		if(o->debuglevel) ast_log(LOG_NOTICE,"txPttOut = %i, chan %s\n",o->pmrChan->txPttOut,ast_channel_name(o->owner));
-		kickptt(o);
-	}
-
-	#if 0	// to write 48KS/s stereo tx data to a file
-	if (!ftxoutraw) ftxoutraw = fopen(TX_CAP_OUT_FILE,"w");
-	if (ftxoutraw) fwrite(o->usbradio_write_buf_1,1,FRAME_SIZE * 2 * 6,ftxoutraw);
-	#endif
-
-	#if DEBUG_CAPTURES == 1	&& XPMR_DEBUG0 == 1
-    if ((o->b.txcap2 && ftxcaptrace) && (fwrite((o->pmrChan->ptxDebug),1,FRAME_SIZE * 2 * 16,ftxcaptrace) != FRAME_SIZE * 2 * 16)) {
-	   ast_log(LOG_ERROR, "fwrite() failed: %s\n", strerror(errno));
-	}
-	#endif
-	
-	// 160 samples * 2 bytes/sample * 2 chan * 6x oversampling to 48KS/s
-	datalen = FRAME_SIZE * 24;  
-	src = 0;					/* read position into f->data */
-	while (src < datalen) 
-	{
-		/* Compute spare room in the buffer */
-		int l = sizeof(o->usbradio_write_buf) - o->usbradio_write_dst;
-
-		if (datalen - src >= l) 
-		{	
-			/* enough to fill a frame */
-			memcpy(o->usbradio_write_buf + o->usbradio_write_dst, o->usbradio_write_buf_1 + src, l);
-			soundcard_writeframe(o, (short *) o->usbradio_write_buf);
-			src += l;
-			o->usbradio_write_dst = 0;
-		} 
-		else 
-		{				
-			/* copy residue */
-			l = datalen - src;
-			memcpy(o->usbradio_write_buf + o->usbradio_write_dst, o->usbradio_write_buf_1 + src, l);
-			src += l;			/* but really, we are done */
-			o->usbradio_write_dst += l;
-		}
-	}
-	#else
-	static FILE *hInput;
-	i16 iBuff[FRAME_SIZE*2*6];
-
-	o->pmrChan->b.rxCapture=1;
-
-	if(!hInput)
-	{
-		hInput  = fopen("/usr/src/xpmr/testdata/rx_in.pcm","r");
-		if(!hInput)
-		{
-			printf(" Input Data File Not Found.\n");
-			return 0;
-		}
-	}
-
-	if(0==fread((void *)iBuff,2,FRAME_SIZE*2*6,hInput))exit;
-
-	PmrRx(  o->pmrChan, 
-		   (i16 *)iBuff,
-		   (i16 *)(o->usbradio_read_buf_8k + AST_FRIENDLY_OFFSET));
-
-	#endif
-
-	#if 0
-	if (!frxoutraw) frxoutraw = fopen(RX_CAP_OUT_FILE,"w");
-    if (frxoutraw) fwrite((o->usbradio_read_buf_8k + AST_FRIENDLY_OFFSET),1,FRAME_SIZE * 2,frxoutraw);
-	#endif
-
-	#if DEBUG_CAPTURES == 1 && XPMR_DEBUG0 == 1
-    if ((frxcaptrace && o->b.rxcap2 && o->pmrChan->b.radioactive) && (fwrite((o->pmrChan->prxDebug),1,FRAME_SIZE * 2 * 16,frxcaptrace) != FRAME_SIZE * 2 * 16 )) {
-		ast_log(LOG_ERROR, "fwrite() failed: %s\n", strerror(errno));
-	}
-	#endif
-
-	cd = 0;
-	if(o->rxcdtype==CD_HID && (o->pmrChan->rxExtCarrierDetect!=o->rxhidsq))
-		o->pmrChan->rxExtCarrierDetect=o->rxhidsq;
-	
-	if(o->rxcdtype==CD_HID_INVERT && (o->pmrChan->rxExtCarrierDetect==o->rxhidsq))
-		o->pmrChan->rxExtCarrierDetect=!o->rxhidsq;
-		
-	if( (o->rxcdtype==CD_HID        && o->rxhidsq)                  ||
-		(o->rxcdtype==CD_HID_INVERT && !o->rxhidsq)                 ||
-		(o->rxcdtype==CD_XPMR_NOISE && o->pmrChan->rxCarrierDetect) ||
-		(o->rxcdtype==CD_XPMR_VOX   && o->pmrChan->rxCarrierDetect)
-	  )
-	{
-		if (!o->pmrChan->txPttOut || o->radioduplex)cd=1;	
-	}
-	else
-	{
-		cd=0;
-	}
-
-	if(cd!=o->rxcarrierdetect)
-	{
-		o->rxcarrierdetect=cd;
-		if(o->debuglevel) ast_log(LOG_NOTICE,"rxcarrierdetect = %i, chan %s\n",cd,ast_channel_name(o->owner));
-		// printf("rxcarrierdetect = %i, chan %s\n",res,o->owner->name);
-	}
-
-	if(o->pmrChan->b.ctcssRxEnable && o->pmrChan->rxCtcss->decode!=o->rxctcssdecode)
-	{
-		if(o->debuglevel)ast_log(LOG_NOTICE,"rxctcssdecode = %i, chan %s\n",o->pmrChan->rxCtcss->decode,ast_channel_name(o->owner));
-		// printf("rxctcssdecode = %i, chan %s\n",o->pmrChan->rxCtcss->decode,o->owner->name);
-		o->rxctcssdecode=o->pmrChan->rxCtcss->decode;
-		strcpy(o->rxctcssfreq, o->pmrChan->rxctcssfreq);
-	}
-
-	#ifndef HAVE_XPMRX
-	if(  !o->pmrChan->b.ctcssRxEnable ||
-		( o->pmrChan->b.ctcssRxEnable && 
-	      o->pmrChan->rxCtcss->decode>CTCSS_NULL && 
-	      o->pmrChan->smode==SMODE_CTCSS )  
-	)
-	{
-		sd=1;	
-	}
-	else
-	{
-		sd=0;
-	}
-	#else
-	if( (!o->pmrChan->b.ctcssRxEnable && !o->pmrChan->b.dcsRxEnable && !o->pmrChan->b.lmrRxEnable) ||
-		( o->pmrChan->b.ctcssRxEnable && 
-	      o->pmrChan->rxCtcss->decode>CTCSS_NULL && 
-	      o->pmrChan->smode==SMODE_CTCSS ) ||
-		( o->pmrChan->b.dcsRxEnable && 
-	      o->pmrChan->decDcs->decode > 0 &&
-	      o->pmrChan->smode==SMODE_DCS )
-	)
-	{
-		sd=1;	
-	}
-	else
-	{
-		sd=0;
-	}
-
-	if(o->pmrChan->decDcs->decode!=o->rxdcsdecode)
-	{													
-		if(o->debuglevel)ast_log(LOG_NOTICE,"rxdcsdecode = %s, chan %s\n",o->pmrChan->rxctcssfreq,ast_channel_name(o->owner));
-		// printf("rxctcssdecode = %i, chan %s\n",o->pmrChan->rxCtcss->decode,o->owner->name);
-		o->rxdcsdecode=o->pmrChan->decDcs->decode;
-		strcpy(o->rxctcssfreq, o->pmrChan->rxctcssfreq);
-	}																							  
-
-	if(o->pmrChan->rptnum && (o->pmrChan->pLsdCtl->cs[o->pmrChan->rptnum].b.rxkeyed != o->rxlsddecode))
-	{								
-		if(o->debuglevel)ast_log(LOG_NOTICE,"rxLSDecode = %s, chan %s\n",o->pmrChan->rxctcssfreq,ast_channel_name(o->owner));
-		o->rxlsddecode=o->pmrChan->pLsdCtl->cs[o->pmrChan->rptnum].b.rxkeyed;
-		strcpy(o->rxctcssfreq, o->pmrChan->rxctcssfreq);
-	}
-
-	if( (o->pmrChan->rptnum>0 && o->pmrChan->smode==SMODE_LSD && o->pmrChan->pLsdCtl->cs[o->pmrChan->rptnum].b.rxkeyed)||
-	    (o->pmrChan->smode==SMODE_DCS && o->pmrChan->decDcs->decode>0) )
-	{
-		sd=1;
-	}
-	#endif
-
-	if ( cd && sd )
-	{
-		//if(!o->rxkeyed)o->pmrChan->dd.b.doitnow=1;
-		if(!o->rxkeyed && o->debuglevel)ast_log(LOG_NOTICE,"o->rxkeyed = 1, chan %s\n", ast_channel_name(o->owner));
-		o->rxkeyed = 1;
-	}
-	else 
-	{
-		//if(o->rxkeyed)o->pmrChan->dd.b.doitnow=1;
-		if(o->rxkeyed && o->debuglevel)ast_log(LOG_NOTICE,"o->rxkeyed = 0, chan %s\n",ast_channel_name(o->owner));
-		o->rxkeyed = 0;
-	}
-
-	// provide rx signal detect conditions
-	if (o->lastrx && (!o->rxkeyed))
-	{
-		o->lastrx = 0;
-		//printf("AST_CONTROL_RADIO_UNKEY\n");
-		wf.subclass.integer = AST_CONTROL_RADIO_UNKEY;
-		ast_queue_frame(o->owner, &wf);
-	}
-	else if ((!o->lastrx) && (o->rxkeyed))
-	{
-		o->lastrx = 1;
-		//printf("AST_CONTROL_RADIO_KEY\n");
-		wf.subclass.integer = AST_CONTROL_RADIO_KEY;
-		if(o->rxctcssdecode)  	
-        {
-	        wf.data.ptr = o->rxctcssfreq;
-	        wf.datalen = strlen(o->rxctcssfreq) + 1;
-			TRACEO(1,("AST_CONTROL_RADIO_KEY text=%s\n",o->rxctcssfreq));
-        }
-		ast_queue_frame(o->owner, &wf);
-	}
-
-	o->readpos = AST_FRIENDLY_OFFSET;	/* reset read pointer for next frame */
-	if (ast_channel_state(c) != AST_STATE_UP)	/* drop data if frame is not up */
-		return f;
-	/* ok we can build and deliver the frame to the caller */
-	f->frametype = AST_FRAME_VOICE;
-	ast_format_set(&f->subclass.format, AST_FORMAT_SLINEAR, 0);
-	f->samples = FRAME_SIZE;
-	f->datalen = FRAME_SIZE * 2;
-	f->data.ptr = o->usbradio_read_buf_8k + AST_FRIENDLY_OFFSET;
-	if (o->boost != BOOST_SCALE) {	/* scale and clip values */
-		int i, x;
-		int16_t *p = (int16_t *) f->data.ptr;
-		for (i = 0; i < f->samples; i++) {
-			x = (p[i] * o->boost) / BOOST_SCALE;
-			if (x > 32767)
-				x = 32767;
-			else if (x < -32768)
-				x = -32768;
-			p[i] = x;
-		}
-	}
-
-	f->offset = AST_FRIENDLY_OFFSET;
-	if (o->dsp)
-	{
-	    f1 = ast_dsp_process(c,o->dsp,f);
-	    if ((f1->frametype == AST_FRAME_DTMF_END) ||
-	      (f1->frametype == AST_FRAME_DTMF_BEGIN))
-	    {
-		if ((f1->subclass.integer == 'm') || (f1->subclass.integer == 'u'))
-		{
-			f1->frametype = AST_FRAME_NULL;
-			f1->subclass.integer = 0;
-			return(f1);
-		}
-		if (f1->frametype == AST_FRAME_DTMF_END)
-			ast_log(LOG_NOTICE, "Got DTMF char %c\n", f1->subclass.integer);
-		return(f1);
-	    }
-	}
-	return f;
-}
-
-static int usbradio_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
-{
-	struct chan_usbradio_pvt *o = ast_channel_tech_pvt(newchan);
-	ast_log(LOG_WARNING,"usbradio_fixup()\n");
-	o->owner = newchan;
-	return 0;
-}
-
-static int usbradio_indicate(struct ast_channel *c, int cond, const void *data, size_t datalen)
-{
-	struct chan_usbradio_pvt *o = ast_channel_tech_pvt(c);
-	int res = -1;
-
-	switch (cond) {
-		case AST_CONTROL_BUSY:
-		case AST_CONTROL_CONGESTION:
-		case AST_CONTROL_RINGING:
-			res = cond;
-			break;
-		case AST_CONTROL_INCOMPLETE:
-			res = AST_CONTROL_CONGESTION;
-			break;
-		case -1:
-#ifndef	NEW_ASTERISK
-			o->cursound = -1;
-			o->nosound = 0;		/* when cursound is -1 nosound must be 0 */
-#endif
-			return 0;
-
-		case AST_CONTROL_VIDUPDATE:
-			res = -1;
-			break;
-		case AST_CONTROL_HOLD:
-			ast_verbose(" << Console Has Been Placed on Hold >> \n");
-			ast_moh_start(c, data, o->mohinterpret);
-			break;
-		case AST_CONTROL_UNHOLD:
-			ast_verbose(" << Console Has Been Retrieved from Hold >> \n");
-			ast_moh_stop(c);
-			break;
-		case AST_CONTROL_PROCEEDING:
-			ast_verbose(" << Call Proceeding... >> \n");
-			ast_moh_stop(c);
-			break;
-		case AST_CONTROL_PROGRESS:
-			ast_verbose(" << Call Progress... >> \n");
-			ast_moh_stop(c);
-			break;
-		case AST_CONTROL_RADIO_KEY:
-			o->txkeyed = 1;
-			if(o->debuglevel)ast_verbose(" << AST_CONTROL_RADIO_KEY Radio Transmit On. >> \n");
-			break;
-		case AST_CONTROL_RADIO_UNKEY:
-			o->txkeyed = 0;
-			if(o->debuglevel)ast_verbose(" << AST_CONTROL_RADIO_UNKEY Radio Transmit Off. >> \n");
-			break;
-		default:
-			ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, ast_channel_name(c));
-			return -1;
-	}
-
-	if (res > -1)
-		ring(o, res);
-
-	return 0;
-}
-
-/*
- * allocate a new channel.
- */
-static struct ast_channel *usbradio_new(struct chan_usbradio_pvt *o, char *ext, char *ctx, int state, const char *linkedid)
-{
-	struct ast_channel *c;
-
-	c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", ext, ctx, linkedid, 0, "Radio/%s", o->name);
-	if (c == NULL)
-		return NULL;
-	ast_channel_tech_set(c, &usbradio_tech);
-	if (o->sounddev < 0)
-		setformat(o, O_RDWR);
-	ast_channel_internal_fd_set(c, 0, o->sounddev);/* -1 if device closed, override later */
-	ast_format_cap_add(ast_channel_nativeformats(c), &slin);
-	ast_format_set(ast_channel_readformat(c), AST_FORMAT_SLINEAR, 0);
-	ast_format_set(ast_channel_writeformat(c), AST_FORMAT_SLINEAR, 0);
-	ast_channel_tech_pvt_set(c, o);
-
-	if (!ast_strlen_zero(o->language))
-		ast_channel_language_set(c, o->language);
-	/* Don't use ast_set_callerid() here because it will
-	 * generate a needless NewCallerID event */
-	if (!ast_strlen_zero(o->cid_num)) {
-		ast_channel_caller(c)->ani.number.valid = 1;
-		ast_channel_caller(c)->ani.number.str = ast_strdup(o->cid_num);
-	}
-	if (!ast_strlen_zero(ext)) {
-		ast_channel_dialed(c)->number.str = ast_strdup(ext);
-	}
-
-	o->owner = c;
-	ast_module_ref(ast_module_info->self);
-	ast_jb_configure(c, &global_jbconf);
-	if (state != AST_STATE_DOWN) {
-		if (ast_pbx_start(c)) {
-			ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(c));
-			ast_hangup(c);
-			o->owner = c = NULL;
-			/* XXX what about the channel itself ? */
-			/* XXX what about usecnt ? */
-		}
-	}
-
-	return c;
-}
-/*
-*/
-static struct ast_channel *usbradio_request(const char *type, struct ast_format_cap *cap, const struct ast_channel *requestor, const char *data, int *cause)
-{
-	struct ast_channel *c;
-	struct chan_usbradio_pvt *o = find_desc(data);
-
-	TRACEO(1,("usbradio_request()\n"));
-
-	if (0)
-	{
-		ast_log(LOG_WARNING, "usbradio_request type <%s> data 0x%p <%s>\n", type, data, data);
-	}
-	if (o == NULL) {
-		ast_log(LOG_NOTICE, "Device %s not found\n", data);
-		/* XXX we could default to 'dsp' perhaps ? */
-		return NULL;
-	}
-	if (!(ast_format_cap_iscompatible(cap, &slin))) {
-		return NULL;
-	}
-	if (o->owner) {
-		ast_log(LOG_NOTICE, "Already have a call (chan %p) on the usb channel\n", o->owner);
-		*cause = AST_CAUSE_BUSY;
-		return NULL;
-	}
-	c = usbradio_new(o, NULL, NULL, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL);
-	if (c == NULL) {
-		ast_log(LOG_WARNING, "Unable to create new usb channel\n");
-		return NULL;
-	}
-		
-	o->b.remoted=0;
-	xpmr_config(o);
-
-	return c;
-}
-/*
-*/
-static int console_key(int fd, int argc, char *argv[])
-{
-	struct chan_usbradio_pvt *o = find_desc(usbradio_active);
-
-	if (argc != 2)
-		return RESULT_SHOWUSAGE; 
-	o->txtestkey = 1;
-	return RESULT_SUCCESS;
-}
-/*
-*/
-static int console_unkey(int fd, int argc, char *argv[])
-{
-	struct chan_usbradio_pvt *o = find_desc(usbradio_active);
-
-	if (argc != 2)
-		return RESULT_SHOWUSAGE;
-	o->txtestkey = 0;
-	return RESULT_SUCCESS;
-}
-
-static int radio_tune(int fd, int argc, char *argv[])
-{
-	struct chan_usbradio_pvt *o = find_desc(usbradio_active);
-	int i=0;
-
-	if ((argc < 2) || (argc > 4))
-		return RESULT_SHOWUSAGE; 
-
-	if (argc == 2) /* just show stuff */
-	{
-		ast_cli(fd,"Active radio interface is [%s]\n",usbradio_active);
-		ast_cli(fd,"Output A is currently set to ");
-		if(o->txmixa==TX_OUT_COMPOSITE)ast_cli(fd,"composite.\n");
-		else if (o->txmixa==TX_OUT_VOICE)ast_cli(fd,"voice.\n");
-		else if (o->txmixa==TX_OUT_LSD)ast_cli(fd,"tone.\n");
-		else if (o->txmixa==TX_OUT_AUX)ast_cli(fd,"auxvoice.\n");
-		else ast_cli(fd,"off.\n");
-
-		ast_cli(fd,"Output B is currently set to ");
-		if(o->txmixb==TX_OUT_COMPOSITE)ast_cli(fd,"composite.\n");
-		else if (o->txmixb==TX_OUT_VOICE)ast_cli(fd,"voice.\n");
-		else if (o->txmixb==TX_OUT_LSD)ast_cli(fd,"tone.\n");
-		else if (o->txmixb==TX_OUT_AUX)ast_cli(fd,"auxvoice.\n");
-		else ast_cli(fd,"off.\n");
-
-		ast_cli(fd,"Tx Voice Level currently set to %d\n",o->txmixaset);
-		ast_cli(fd,"Tx Tone Level currently set to %d\n",o->txctcssadj);
-		ast_cli(fd,"Rx Squelch currently set to %d\n",o->rxsquelchadj);
-		ast_cli(fd,"Device String is %s\n",o->devstr);
-		return RESULT_SHOWUSAGE;
-	}
-
-	o->pmrChan->b.tuning=1;
-
-	if (!strcasecmp(argv[2],"rxnoise")) tune_rxinput(fd,o);
-	else if (!strcasecmp(argv[2],"rxvoice")) tune_rxvoice(fd,o);
-	else if (!strcasecmp(argv[2],"rxtone")) tune_rxctcss(fd,o);
-	else if (!strcasecmp(argv[2],"rxsquelch"))
-	{
-		if (argc == 3)
-		{
-		    ast_cli(fd,"Current Signal Strength is %d\n",((32767-o->pmrChan->rxRssi)*1000/32767));
-		    ast_cli(fd,"Current Squelch setting is %d\n",o->rxsquelchadj);
-			//ast_cli(fd,"Current Raw RSSI        is %d\n",o->pmrChan->rxRssi);
-		    //ast_cli(fd,"Current (real) Squelch setting is %d\n",*(o->pmrChan->prxSquelchAdjust));
-		} else {
-			i = atoi(argv[3]);
-			if ((i < 0) || (i > 999)) return RESULT_SHOWUSAGE;
-			ast_cli(fd,"Changed Squelch setting to %d\n",i);
-			o->rxsquelchadj = i;
-			*(o->pmrChan->prxSquelchAdjust)= ((999 - i) * 32767) / 1000;
-		}
-	}
-	else if (!strcasecmp(argv[2],"txvoice")) {
-		i = 0;
-
-		if( (o->txmixa!=TX_OUT_VOICE) && (o->txmixb!=TX_OUT_VOICE) &&
-			(o->txmixa!=TX_OUT_COMPOSITE) && (o->txmixb!=TX_OUT_COMPOSITE)
-		  )
-		{
-			ast_log(LOG_ERROR,"No txvoice output configured.\n");
-		}
-		else if (argc == 3)
-		{
-			if((o->txmixa==TX_OUT_VOICE)||(o->txmixa==TX_OUT_COMPOSITE))
-				ast_cli(fd,"Current txvoice setting on Channel A is %d\n",o->txmixaset);
-			else
-				ast_cli(fd,"Current txvoice setting on Channel B is %d\n",o->txmixbset);
-		}
-		else
-		{
-			i = atoi(argv[3]);
-			if ((i < 0) || (i > 999)) return RESULT_SHOWUSAGE;
-
-			if((o->txmixa==TX_OUT_VOICE)||(o->txmixa==TX_OUT_COMPOSITE))
-			{
-			 	o->txmixaset=i;
-				ast_cli(fd,"Changed txvoice setting on Channel A to %d\n",o->txmixaset);
-			}
-			else
-			{
-			 	o->txmixbset=i;   
-				ast_cli(fd,"Changed txvoice setting on Channel B to %d\n",o->txmixbset);
-			}
-			mixer_write(o);
-			mult_set(o);
-			ast_cli(fd,"Changed Tx Voice Output setting to %d\n",i);
-		}
-		o->pmrChan->b.txCtcssInhibit=1;
-		tune_txoutput(o,i,fd);
-		o->pmrChan->b.txCtcssInhibit=0;
-	}
-	else if (!strcasecmp(argv[2],"txall")) {
-		i = 0;
-
-		if( (o->txmixa!=TX_OUT_VOICE) && (o->txmixb!=TX_OUT_VOICE) &&
-			(o->txmixa!=TX_OUT_COMPOSITE) && (o->txmixb!=TX_OUT_COMPOSITE)
-		  )
-		{
-			ast_log(LOG_ERROR,"No txvoice output configured.\n");
-		}
-		else if (argc == 3)
-		{
-			if((o->txmixa==TX_OUT_VOICE)||(o->txmixa==TX_OUT_COMPOSITE))
-				ast_cli(fd,"Current txvoice setting on Channel A is %d\n",o->txmixaset);
-			else
-				ast_cli(fd,"Current txvoice setting on Channel B is %d\n",o->txmixbset);
-		}
-		else
-		{
-			i = atoi(argv[3]);
-			if ((i < 0) || (i > 999)) return RESULT_SHOWUSAGE;
-
-			if((o->txmixa==TX_OUT_VOICE)||(o->txmixa==TX_OUT_COMPOSITE))
-			{
-			 	o->txmixaset=i;
-				ast_cli(fd,"Changed txvoice setting on Channel A to %d\n",o->txmixaset);
-			}
-			else
-			{
-			 	o->txmixbset=i;   
-				ast_cli(fd,"Changed txvoice setting on Channel B to %d\n",o->txmixbset);
-			}
-			mixer_write(o);
-			mult_set(o);
-			ast_cli(fd,"Changed Tx Voice Output setting to %d\n",i);
-		}
-		tune_txoutput(o,i,fd);
-	}
-	else if (!strcasecmp(argv[2],"auxvoice")) {
-		i = 0;
-		if( (o->txmixa!=TX_OUT_AUX) && (o->txmixb!=TX_OUT_AUX))
-		{
-			ast_log(LOG_WARNING,"No auxvoice output configured.\n");
-		}
-		else if (argc == 3)
-		{
-			if(o->txmixa==TX_OUT_AUX)
-				ast_cli(fd,"Current auxvoice setting on Channel A is %d\n",o->txmixaset);
-			else
-				ast_cli(fd,"Current auxvoice setting on Channel B is %d\n",o->txmixbset);
-		}
-		else
-		{
-			i = atoi(argv[3]);
-			if ((i < 0) || (i > 999)) return RESULT_SHOWUSAGE;
-			if(o->txmixa==TX_OUT_AUX)
-			{
-				o->txmixbset=i;
-				ast_cli(fd,"Changed auxvoice setting on Channel A to %d\n",o->txmixaset);
-			}
-			else
-			{
-				o->txmixbset=i;
-				ast_cli(fd,"Changed auxvoice setting on Channel B to %d\n",o->txmixbset);
-			}
-			mixer_write(o);
-			mult_set(o);
-		}
-		//tune_auxoutput(o,i);
-	}
-	else if (!strcasecmp(argv[2],"txtone"))
-	{
-		if (argc == 3)
-			ast_cli(fd,"Current Tx CTCSS modulation setting = %d\n",o->txctcssadj);
-		else
-		{
-			i = atoi(argv[3]);
-			if ((i < 0) || (i > 999)) return RESULT_SHOWUSAGE;
-			o->txctcssadj = i;
-			set_txctcss_level(o);
-			ast_cli(fd,"Changed Tx CTCSS modulation setting to %i\n",i);
-		}
-		o->txtestkey=1;
-		usleep(5000000);
-		o->txtestkey=0;
-	}
-	else if (!strcasecmp(argv[2],"dump")) pmrdump(o);
-	else if (!strcasecmp(argv[2],"nocap")) 	
-	{
-		ast_cli(fd,"File capture (trace) was rx=%d tx=%d and now off.\n",o->b.rxcap2,o->b.txcap2);
-		ast_cli(fd,"File capture (raw)   was rx=%d tx=%d and now off.\n",o->b.rxcapraw,o->b.txcapraw);
-		o->b.rxcapraw=o->b.txcapraw=o->b.rxcap2=o->b.txcap2=o->pmrChan->b.rxCapture=o->pmrChan->b.txCapture=0;
-		if (frxcapraw) { fclose(frxcapraw); frxcapraw = NULL; }
-		if (frxcaptrace) { fclose(frxcaptrace); frxcaptrace = NULL; }
-		if (frxoutraw) { fclose(frxoutraw); frxoutraw = NULL; }
-		if (ftxcapraw) { fclose(ftxcapraw); ftxcapraw = NULL; }
-		if (ftxcaptrace) { fclose(ftxcaptrace); ftxcaptrace = NULL; }
-		if (ftxoutraw) { fclose(ftxoutraw); ftxoutraw = NULL; }
-	}
-	else if (!strcasecmp(argv[2],"rxtracecap")) 
-	{
-		if (!frxcaptrace) frxcaptrace= fopen(RX_CAP_TRACE_FILE,"w");
-		ast_cli(fd,"Trace rx on.\n");
-		o->b.rxcap2=o->pmrChan->b.rxCapture=1;
-	}
-	else if (!strcasecmp(argv[2],"txtracecap")) 
-	{
-		if (!ftxcaptrace) ftxcaptrace= fopen(TX_CAP_TRACE_FILE,"w");
-		ast_cli(fd,"Trace tx on.\n");
-		o->b.txcap2=o->pmrChan->b.txCapture=1;
-	}
-	else if (!strcasecmp(argv[2],"rxcap")) 
-	{
-		if (!frxcapraw) frxcapraw = fopen(RX_CAP_RAW_FILE,"w");
-		ast_cli(fd,"cap rx raw on.\n");
-		o->b.rxcapraw=1;
-	}
-	else if (!strcasecmp(argv[2],"txcap")) 
-	{
-		if (!ftxcapraw) ftxcapraw = fopen(TX_CAP_RAW_FILE,"w");
-		ast_cli(fd,"cap tx raw on.\n");
-		o->b.txcapraw=1;
-	}
-	else if (!strcasecmp(argv[2],"save"))
-	{
-		tune_write(o);
-		ast_cli(fd,"Saved radio tuning settings to usbradio_tune_%s.conf\n",o->name);
-	}
-	else if (!strcasecmp(argv[2],"load"))
-	{
-		ast_mutex_lock(&o->eepromlock);
-		while(o->eepromctl)
-		{
-			ast_mutex_unlock(&o->eepromlock);
-			usleep(10000);
-			ast_mutex_lock(&o->eepromlock);
-		}
-		o->eepromctl = 1;  /* request a load */
-		ast_mutex_unlock(&o->eepromlock);
-
-		ast_cli(fd,"Requesting loading of tuning settings from EEPROM for channel %s\n",o->name);
-	}
-	else
-	{
-		o->pmrChan->b.tuning=0;
-		return RESULT_SHOWUSAGE;
-	}
-	o->pmrChan->b.tuning=0;
-	return RESULT_SUCCESS;
-}
-
-/*
-	set transmit ctcss modulation level
-	adjust mixer output or internal gain depending on output type
-	setting range is 0.0 to 0.9
-*/
-static int set_txctcss_level(struct chan_usbradio_pvt *o)
-{							  
-	if (o->txmixa == TX_OUT_LSD)
-	{
-//		o->txmixaset=(151*o->txctcssadj) / 1000;
-		o->txmixaset=o->txctcssadj;
-		mixer_write(o);
-		mult_set(o);
-	}
-	else if (o->txmixb == TX_OUT_LSD)
-	{
-//		o->txmixbset=(151*o->txctcssadj) / 1000;
-		o->txmixbset=o->txctcssadj;
-		mixer_write(o);
-		mult_set(o);
-	}
-	else
-	{
-		*o->pmrChan->ptxCtcssAdjust=(o->txctcssadj * M_Q8) / 1000;
-	}
-	return 0;
-}
-/*
-	CLI debugging on and off
-*/
-static int radio_set_debug(int fd, int argc, char *argv[])
-{
-	struct chan_usbradio_pvt *o = find_desc(usbradio_active);
-
-	o->debuglevel=1;
-	ast_cli(fd,"usbradio debug on.\n");
-	return RESULT_SUCCESS;
-}
-
-static int radio_set_debug_off(int fd, int argc, char *argv[])
-{
-	struct chan_usbradio_pvt *o = find_desc(usbradio_active);
-
-	o->debuglevel=0;
-	ast_cli(fd,"usbradio debug off.\n");
-	return RESULT_SUCCESS;
-}
-
-static int radio_active(int fd, int argc, char *argv[])
-{
-        if (argc == 2)
-                ast_cli(fd, "active (command) USB Radio device is [%s]\n", usbradio_active);
-        else if (argc != 3)
-                return RESULT_SHOWUSAGE;
-        else {
-                struct chan_usbradio_pvt *o;
-                if (strcmp(argv[2], "show") == 0) {
-                        for (o = usbradio_default.next; o; o = o->next)
-                                ast_cli(fd, "device [%s] exists\n", o->name);
-                        return RESULT_SUCCESS;
-                }
-                o = find_desc(argv[2]);
-                if (o == NULL)
-                        ast_cli(fd, "No device [%s] exists\n", argv[2]);
-                else
-				{
-					struct chan_usbradio_pvt *ao;
-					for (ao = usbradio_default.next; ao && ao->name ; ao = ao->next)ao->pmrChan->b.radioactive=0;
-                    usbradio_active = o->name;
-				    o->pmrChan->b.radioactive=1;
-				}
-        }
-        return RESULT_SUCCESS;
-}
-/*
-	CLI debugging on and off
-*/
-static int radio_set_xpmr_debug(int fd, int argc, char *argv[])
-{
-	struct chan_usbradio_pvt *o = find_desc(usbradio_active);
-
-	if (argc == 4)
-	{
-		int i;
-		i = atoi(argv[3]);
-		if ((i >= 0) && (i <= 100))
-		{ 
-			o->pmrChan->tracelevel=i;
-		}
-    }
-	// add ability to set it for a number of frames after which it reverts
-	ast_cli(fd,"usbradio xdebug on tracelevel %i\n",o->pmrChan->tracelevel);
-
-	return RESULT_SUCCESS;
-}
-
-
-static char key_usage[] =
-	"Usage: radio key\n"
-	"       Simulates COR active.\n";
-
-static char unkey_usage[] =
-	"Usage: radio unkey\n"
-	"       Simulates COR un-active.\n";
-
-static char active_usage[] =
-        "Usage: radio active [device-name]\n"
-        "       If used without a parameter, displays which device is the current\n"
-        "one being commanded.  If a device is specified, the commanded radio device is changed\n"
-        "to the device specified.\n";
-/*
-radio tune 6 3000		measured tx value
-*/
-static char radio_tune_usage[] =
-	"Usage: radio tune <function>\n"
-	"       rxnoise\n"
-	"       rxvoice\n"
-	"       rxtone\n"
-	"       rxsquelch [newsetting]\n"
-	"       txvoice [newsetting]\n"
-	"       txtone [newsetting]\n"
-	"       auxvoice [newsetting]\n"
-	"       save (settings to tuning file)\n"
-	"       load (tuning settings from EEPROM)\n"
-	"\n       All [newsetting]'s are values 0-999\n\n";
-					  
-#ifndef	NEW_ASTERISK
-
-static struct ast_cli_entry cli_usbradio[] = {
-	{ { "radio", "key", NULL },
-	console_key, "Simulate Rx Signal Present",
-	key_usage, NULL, NULL},
-
-	{ { "radio", "unkey", NULL },
-	console_unkey, "Simulate Rx Signal Lusb",
-	unkey_usage, NULL, NULL },
-
-	{ { "radio", "tune", NULL },
-	radio_tune, "Radio Tune",
-	radio_tune_usage, NULL, NULL },
-
-	{ { "radio", "set", "debug", NULL },
-	radio_set_debug, "Radio Debug",
-	radio_tune_usage, NULL, NULL },
-
-	{ { "radio", "set", "debug", "off", NULL },
-	radio_set_debug_off, "Radio Debug",
-	radio_tune_usage, NULL, NULL },
-
-	{ { "radio", "active", NULL },
-	radio_active, "Change commanded device",
-	active_usage, NULL, NULL },
-
-    { { "radio", "set", "xdebug", NULL },
-	radio_set_xpmr_debug, "Radio set xpmr debug level",
-	active_usage, NULL, NULL },
-
-};
-#endif
-
-/*
- * store the callerid components
- */
-#if 0
-static void store_callerid(struct chan_usbradio_pvt *o, char *s)
-{
-	ast_callerid_split(s, o->cid_name, sizeof(o->cid_name), o->cid_num, sizeof(o->cid_num));
-}
-#endif
-
-static void store_rxdemod(struct chan_usbradio_pvt *o, const char *s)
-{
-	if (!strcasecmp(s,"no")){
-		o->rxdemod = RX_AUDIO_NONE;
-	}
-	else if (!strcasecmp(s,"speaker")){
-		o->rxdemod = RX_AUDIO_SPEAKER;
-	}
-	else if (!strcasecmp(s,"flat")){
-			o->rxdemod = RX_AUDIO_FLAT;
-	}	
-	else {
-		ast_log(LOG_WARNING,"Unrecognized rxdemod parameter: %s\n",s);
-	}
-
-	//ast_log(LOG_WARNING, "set rxdemod = %s\n", s);
-}
-
-					   
-static void store_txmixa(struct chan_usbradio_pvt *o, const char *s)
-{
-	if (!strcasecmp(s,"no")){
-		o->txmixa = TX_OUT_OFF;
-	}
-	else if (!strcasecmp(s,"voice")){
-		o->txmixa = TX_OUT_VOICE;
-	}
-	else if (!strcasecmp(s,"tone")){
-			o->txmixa = TX_OUT_LSD;
-	}	
-	else if (!strcasecmp(s,"composite")){
-		o->txmixa = TX_OUT_COMPOSITE;
-	}	
-	else if (!strcasecmp(s,"auxvoice")){
-		o->txmixa = TX_OUT_AUX;
-	}	
-	else {
-		ast_log(LOG_WARNING,"Unrecognized txmixa parameter: %s\n",s);
-	}
-
-	//ast_log(LOG_WARNING, "set txmixa = %s\n", s);
-}
-
-static void store_txmixb(struct chan_usbradio_pvt *o, const char *s)
-{
-	if (!strcasecmp(s,"no")){
-		o->txmixb = TX_OUT_OFF;
-	}
-	else if (!strcasecmp(s,"voice")){
-		o->txmixb = TX_OUT_VOICE;
-	}
-	else if (!strcasecmp(s,"tone")){
-			o->txmixb = TX_OUT_LSD;
-	}	
-	else if (!strcasecmp(s,"composite")){
-		o->txmixb = TX_OUT_COMPOSITE;
-	}	
-	else if (!strcasecmp(s,"auxvoice")){
-		o->txmixb = TX_OUT_AUX;
-	}	
-	else {
-		ast_log(LOG_WARNING,"Unrecognized txmixb parameter: %s\n",s);
-	}
-
-	//ast_log(LOG_WARNING, "set txmixb = %s\n", s);
-}
-/*
-*/
-static void store_rxcdtype(struct chan_usbradio_pvt *o, const char *s)
-{
-	if (!strcasecmp(s,"no")){
-		o->rxcdtype = CD_IGNORE;
-	}
-	else if (!strcasecmp(s,"usb")){
-		o->rxcdtype = CD_HID;
-	}
-	else if (!strcasecmp(s,"dsp")){
-		o->rxcdtype = CD_XPMR_NOISE;
-	}	
-	else if (!strcasecmp(s,"vox")){
-		o->rxcdtype = CD_XPMR_VOX;
-	}	
-	else if (!strcasecmp(s,"usbinvert")){
-		o->rxcdtype = CD_HID_INVERT;
-	}	
-	else {
-		ast_log(LOG_WARNING,"Unrecognized rxcdtype parameter: %s\n",s);
-	}
-
-	//ast_log(LOG_WARNING, "set rxcdtype = %s\n", s);
-}
-/*
-*/
-static void store_rxsdtype(struct chan_usbradio_pvt *o, const char *s)
-{
-	if (!strcasecmp(s,"no") || !strcasecmp(s,"SD_IGNORE")){
-		o->rxsdtype = SD_IGNORE;
-	}
-	else if (!strcasecmp(s,"usb") || !strcasecmp(s,"SD_HID")){
-		o->rxsdtype = SD_HID;
-	}
-	else if (!strcasecmp(s,"usbinvert") || !strcasecmp(s,"SD_HID_INVERT")){
-		o->rxsdtype = SD_HID_INVERT;
-	}	
-	else if (!strcasecmp(s,"software") || !strcasecmp(s,"SD_XPMR")){
-		o->rxsdtype = SD_XPMR;
-	}	
-	else {
-		ast_log(LOG_WARNING,"Unrecognized rxsdtype parameter: %s\n",s);
-	}
-
-	//ast_log(LOG_WARNING, "set rxsdtype = %s\n", s);
-}
-/*
-*/
-static void store_rxgain(struct chan_usbradio_pvt *o, const char *s)
-{
-	float f;
-	sscanf(s, "%30f", &f); 
-	o->rxgain = f;
-	//ast_log(LOG_WARNING, "set rxgain = %f\n", f);
-}
-/*
-*/
-static void store_rxvoiceadj(struct chan_usbradio_pvt *o, const char *s)
-{
-	float f;
-	sscanf(s, "%30f", &f);
-	o->rxvoiceadj = f;
-	//ast_log(LOG_WARNING, "set rxvoiceadj = %f\n", f);
-}
-/*
-*/
-static void store_rxctcssadj(struct chan_usbradio_pvt *o, const char *s)
-{
-	float f;
-	sscanf(s, "%30f", &f);
-	o->rxctcssadj = f;
-	//ast_log(LOG_WARNING, "set rxctcssadj = %f\n", f);
-}
-/*
-*/
-static void store_txtoctype(struct chan_usbradio_pvt *o, const char *s)
-{
-	if (!strcasecmp(s,"no") || !strcasecmp(s,"TOC_NONE")){
-		o->txtoctype = TOC_NONE;
-	}
-	else if (!strcasecmp(s,"phase") || !strcasecmp(s,"TOC_PHASE")){
-		o->txtoctype = TOC_PHASE;
-	}
-	else if (!strcasecmp(s,"notone") || !strcasecmp(s,"TOC_NOTONE")){
-		o->txtoctype = TOC_NOTONE;
-	}	
-	else {
-		ast_log(LOG_WARNING,"Unrecognized txtoctype parameter: %s\n",s);
-	}
-}
-/*
-*/
-static void tune_txoutput(struct chan_usbradio_pvt *o, int value, int fd)
-{
-	o->txtestkey=1;
-	o->pmrChan->txPttIn=1;
-	TxTestTone(o->pmrChan, 1);	  // generate 1KHz tone at 7200 peak
-	if (fd > 0) ast_cli(fd,"Tone output starting on channel %s...\n",o->name);
-	usleep(5000000);
-	TxTestTone(o->pmrChan, 0);
-	if (fd > 0) ast_cli(fd,"Tone output ending on channel %s...\n",o->name);
-	o->pmrChan->txPttIn=0;
-	o->txtestkey=0;
-}
-/*
-*/
-static void tune_rxinput(int fd, struct chan_usbradio_pvt *o)
-{
-	const int target=23000;
-	const int tolerance=2000;
-	const int settingmin=1;
-	const int settingstart=2;
-	const int maxtries=12;
-
-	float settingmax;
-	
-	int setting=0, tries=0, tmpdiscfactor, meas;
-
-	settingmax = o->micmax;
-
-	o->pmrChan->b.tuning=1;
-
-	setting = settingstart;
-
-    ast_cli(fd,"tune rxnoise maxtries=%i, target=%i, tolerance=%i\n",maxtries,target,tolerance);
-
-	while(tries<maxtries)
-	{
-		setamixer(o->devicenum,MIXER_PARAM_MIC_CAPTURE_VOL,setting,0);
-		setamixer(o->devicenum,MIXER_PARAM_MIC_BOOST,o->rxboostset,0);
-       
-		usleep(100000);
-		if(o->rxcdtype!=CD_XPMR_NOISE || o->rxdemod==RX_AUDIO_SPEAKER) 
-		{
-			// printf("Measure Direct Input\n");
-			o->pmrChan->spsMeasure->source = o->pmrChan->spsRx->source;
-			o->pmrChan->spsMeasure->discfactor=2000;
-			o->pmrChan->spsMeasure->enabled=1;
-			o->pmrChan->spsMeasure->amax = o->pmrChan->spsMeasure->amin = 0;
-			usleep(400000);	
-			meas=o->pmrChan->spsMeasure->apeak;
-			o->pmrChan->spsMeasure->enabled=0;	
-		}
-		else
-		{
-			// printf("Measure HF Noise\n");
-			tmpdiscfactor=o->pmrChan->spsRx->discfactor;
-			o->pmrChan->spsRx->discfactor=(i16)2000;
-			o->pmrChan->spsRx->discounteru=o->pmrChan->spsRx->discounterl=0;
-			o->pmrChan->spsRx->amax=o->pmrChan->spsRx->amin=0;
-			usleep(200000);
-			meas=o->pmrChan->rxRssi;
-			o->pmrChan->spsRx->discfactor=tmpdiscfactor;
-			o->pmrChan->spsRx->discounteru=o->pmrChan->spsRx->discounterl=0;
-			o->pmrChan->spsRx->amax=o->pmrChan->spsRx->amin=0;
-		}
-        if(!meas)meas++;
-		ast_cli(fd,"tries=%i, setting=%i, meas=%i\n",tries,setting,meas);
-
-		if( meas<(target-tolerance) || meas>(target+tolerance) || tries<3){
-			setting=setting*target/meas;
-		}
-		else if(tries>4 && meas>(target-tolerance) && meas<(target+tolerance) )
-		{
-			break;
-		}
-
-		if(setting<settingmin)setting=settingmin;
-		else if(setting>settingmax)setting=settingmax;
-
-		tries++;
-	}
-	ast_cli(fd,"DONE tries=%i, setting=%i, meas=%i\n",tries,
-		(setting * 1000) / o->micmax,meas);
-	if( meas<(target-tolerance) || meas>(target+tolerance) ){
-		ast_cli(fd,"ERROR: RX INPUT ADJUST FAILED.\n");
-	}else{
-		ast_cli(fd,"INFO: RX INPUT ADJUST SUCCESS.\n");	
-		o->rxmixerset=(setting * 1000) / o->micmax;
-	}
-	o->pmrChan->b.tuning=0;
-}
-/*
-*/
-static void tune_rxvoice(int fd, struct chan_usbradio_pvt *o)
-{
-	const int target=7200;	 			// peak
-	const int tolerance=360;	   		// peak to peak
-	const float settingmin=0.1;
-	const float settingmax=4;
-	const float settingstart=1;
-	const int maxtries=12;
-
-	float setting;
-
-	int tries=0, meas;
-
-	ast_cli(fd,"INFO: RX VOICE ADJUST START.\n");	
-	ast_cli(fd,"target=%i tolerance=%i \n",target,tolerance);
-
-	o->pmrChan->b.tuning=1;
-	if(!o->pmrChan->spsMeasure)
-		ast_cli(fd,"ERROR: NO MEASURE BLOCK.\n");
-
-	if(!o->pmrChan->spsMeasure->source || !o->pmrChan->prxVoiceAdjust )
-		ast_cli(fd,"ERROR: NO SOURCE OR MEASURE SETTING.\n");
-
-	o->pmrChan->spsMeasure->source=o->pmrChan->spsRxOut->sink;
-	o->pmrChan->spsMeasure->enabled=1;
-	o->pmrChan->spsMeasure->discfactor=1000;
-	
-	setting=settingstart;
-
-	// ast_cli(fd,"ERROR: NO MEASURE BLOCK.\n");
-
-	while(tries<maxtries)
-	{
-		*(o->pmrChan->prxVoiceAdjust)=setting*M_Q8;
-		usleep(10000);
-    	o->pmrChan->spsMeasure->amax = o->pmrChan->spsMeasure->amin = 0;
-		usleep(1000000);
-		meas = o->pmrChan->spsMeasure->apeak;
-		ast_cli(fd,"tries=%i, setting=%f, meas=%i\n",tries,setting,meas);
-
-		if( meas<(target-tolerance) || meas>(target+tolerance) || tries<3){
-			setting=setting*target/meas;
-		}
-		else if(tries>4 && meas>(target-tolerance) && meas<(target+tolerance) )
-		{
-			break;
-		}
-		if(setting<settingmin)setting=settingmin;
-		else if(setting>settingmax)setting=settingmax;
-
-		tries++;
-	}
-
-	o->pmrChan->spsMeasure->enabled=0;
-
-	ast_cli(fd,"DONE tries=%i, setting=%f, meas=%f\n",tries,setting,(float)meas);
-	if( meas<(target-tolerance) || meas>(target+tolerance) ){
-		ast_cli(fd,"ERROR: RX VOICE GAIN ADJUST FAILED.\n");
-	}else{
-		ast_cli(fd,"INFO: RX VOICE GAIN ADJUST SUCCESS.\n");
-		o->rxvoiceadj=setting;
-	}
-	o->pmrChan->b.tuning=0;
-}
-/*
-*/
-static void tune_rxctcss(int fd, struct chan_usbradio_pvt *o)
-{
-	const int target=2400;		 // was 4096 pre 20080205
-	const int tolerance=100;
-	const float settingmin=0.1;
-	const float settingmax=8;
-	const float settingstart=1;
-	const int maxtries=12;
-
-	float setting;
-	int tries=0, meas;
-
-	ast_cli(fd,"INFO: RX CTCSS ADJUST START.\n");	
-	ast_cli(fd,"target=%i tolerance=%i \n",target,tolerance);
-
-	o->pmrChan->b.tuning=1;
-	o->pmrChan->spsMeasure->source=o->pmrChan->prxCtcssMeasure;
-	o->pmrChan->spsMeasure->discfactor=400;
-	o->pmrChan->spsMeasure->enabled=1;
-
-	setting=settingstart;
-
-	while(tries<maxtries)
-	{
-		*(o->pmrChan->prxCtcssAdjust)=setting*M_Q8;
-		usleep(10000);
-    	o->pmrChan->spsMeasure->amax = o->pmrChan->spsMeasure->amin = 0;
-		usleep(500000);
-		meas = o->pmrChan->spsMeasure->apeak;
-		ast_cli(fd,"tries=%i, setting=%f, meas=%i\n",tries,setting,meas);
-
-		if( meas<(target-tolerance) || meas>(target+tolerance) || tries<3){
-			setting=setting*target/meas;
-		}
-		else if(tries>4 && meas>(target-tolerance) && meas<(target+tolerance) )
-		{
-			break;
-		}
-		if(setting<settingmin)setting=settingmin;
-		else if(setting>settingmax)setting=settingmax;
-
-		tries++;
-	}
-	o->pmrChan->spsMeasure->enabled=0;
-	ast_cli(fd,"DONE tries=%i, setting=%f, meas=%f\n",tries,setting,(float)meas);
-	if( meas<(target-tolerance) || meas>(target+tolerance) ){
-		ast_cli(fd,"ERROR: RX CTCSS GAIN ADJUST FAILED.\n");
-	}else{
-		ast_cli(fd,"INFO: RX CTCSS GAIN ADJUST SUCCESS.\n");
-		o->rxctcssadj=setting;
-	}
-	o->pmrChan->b.tuning=0;
-}
-/*
-	after radio tune is performed data is serialized here 
-*/
-static void tune_write(struct chan_usbradio_pvt *o)
-{
-	FILE *fp;
-	char fname[200];
-
- 	snprintf(fname,sizeof(fname) - 1,"/etc/asterisk/usbradio_tune_%s.conf",o->name);
-	fp = fopen(fname,"w");
-
-	fprintf(fp,"[%s]\n",o->name);
-
-	fprintf(fp,"; name=%s\n",o->name);
-	fprintf(fp,"; devicenum=%i\n",o->devicenum);
-	fprintf(fp,"devstr=%s\n",o->devstr);
-	fprintf(fp,"rxmixerset=%i\n",o->rxmixerset);
-	fprintf(fp,"txmixaset=%i\n",o->txmixaset);
-	fprintf(fp,"txmixbset=%i\n",o->txmixbset);
-	fprintf(fp,"rxvoiceadj=%f\n",o->rxvoiceadj);
-	fprintf(fp,"rxctcssadj=%f\n",o->rxctcssadj);
-	fprintf(fp,"txctcssadj=%i\n",o->txctcssadj);
-	fprintf(fp,"rxsquelchadj=%i\n",o->rxsquelchadj);
-	fclose(fp);
-
-	if(o->wanteeprom)
-	{
-		ast_mutex_lock(&o->eepromlock);
-		while(o->eepromctl)
-		{
-			ast_mutex_unlock(&o->eepromlock);
-			usleep(10000);
-			ast_mutex_lock(&o->eepromlock);
-		}
-		o->eeprom[EEPROM_RXMIXERSET] = o->rxmixerset;
-		o->eeprom[EEPROM_TXMIXASET] = o->txmixaset;
-		o->eeprom[EEPROM_TXMIXBSET] = o->txmixbset;
-		memcpy(&o->eeprom[EEPROM_RXVOICEADJ],&o->rxvoiceadj,sizeof(float));
-		memcpy(&o->eeprom[EEPROM_RXCTCSSADJ],&o->rxctcssadj,sizeof(float));
-		o->eeprom[EEPROM_TXCTCSSADJ] = o->txctcssadj;
-		o->eeprom[EEPROM_RXSQUELCHADJ] = o->rxsquelchadj;
-		o->eepromctl = 2;  /* request a write */
-		ast_mutex_unlock(&o->eepromlock);
-	}
-}
-//
-static void mixer_write(struct chan_usbradio_pvt *o)
-{
-	setamixer(o->devicenum,MIXER_PARAM_MIC_PLAYBACK_SW,0,0);
-	setamixer(o->devicenum,MIXER_PARAM_MIC_PLAYBACK_VOL,0,0);
-	setamixer(o->devicenum,MIXER_PARAM_SPKR_PLAYBACK_SW,1,0);
-	setamixer(o->devicenum,MIXER_PARAM_SPKR_PLAYBACK_VOL,
-		o->txmixaset * o->spkrmax / 1000,
-		o->txmixbset * o->spkrmax / 1000);
-	setamixer(o->devicenum,MIXER_PARAM_MIC_CAPTURE_VOL,
-		o->rxmixerset * o->micmax / 1000,0);
-	setamixer(o->devicenum,MIXER_PARAM_MIC_BOOST,o->rxboostset,0);
-	setamixer(o->devicenum,MIXER_PARAM_MIC_CAPTURE_SW,1,0);
-}
-/*
-	adjust dsp multiplier to add resolution to tx level adjustment
-*/
-static void mult_set(struct chan_usbradio_pvt *o)
-{
-
-	if(o->pmrChan->spsTxOutA) {
-		o->pmrChan->spsTxOutA->outputGain = 
-			mult_calc((o->txmixaset * 152) / 1000);
-	}
-	if(o->pmrChan->spsTxOutB){
-		o->pmrChan->spsTxOutB->outputGain = 
-			mult_calc((o->txmixbset * 152) / 1000);
-	}
-}
-//
-// input 0 - 151 outputs are pot and multiplier
-//
-static int mult_calc(int value)
-{
-	const int multx=M_Q8;
-	int pot,mult;
-
-	pot=((int)(value/4)*4)+2;
-	mult = multx-( ( multx * (3-(value%4)) ) / (pot+2) );
-	return(mult);
-}
-
-#define pd(x) {printf(#x" = %d\n",x);}
-#define pp(x) {printf(#x" = %p\n",x);}
-#define ps(x) {printf(#x" = %s\n",x);}
-#define pf(x) {printf(#x" = %f\n",x);}
-
-
-#if 0
-/*
-	do hid output if only requirement is ptt out
-	this give fastest performance with least overhead
-	where gpio inputs are not required.
-*/
-
-static int usbhider(struct chan_usbradio_pvt *o, int opt)
-{
-	unsigned char buf[4];
-	char lastrx, txtmp;
-
-	if(opt)
-	{
-		struct usb_device *usb_dev;
-
-		usb_dev = hid_device_init(o->devstr);
-		if (usb_dev == NULL) {
-			ast_log(LOG_ERROR,"USB HID device not found\n");
-			return -1;
-		}
-		o->usb_handle = usb_open(usb_dev);
-		if (o->usb_handle == NULL) {
-		    ast_log(LOG_ERROR,"Not able to open USB device\n");
-			return -1;
-		}
-		if (usb_claim_interface(o->usb_handle,C108_HID_INTERFACE) < 0)
-		{
-		    if (usb_detach_kernel_driver_np(o->usb_handle,C108_HID_INTERFACE) < 0) {
-			    ast_log(LOG_ERROR,"Not able to detach the USB device\n");
-				return -1;
-			}
-			if (usb_claim_interface(o->usb_handle,C108_HID_INTERFACE) < 0) {
-				ast_log(LOG_ERROR,"Not able to claim the USB device\n");
-				return -1;
-			}
-		}
-	
-		memset(buf,0,sizeof(buf));
-		buf[2] = o->hid_gpio_ctl;
-		buf[1] = 0;
-		hid_set_outputs(o->usb_handle,buf);
-		memcpy(bufsave,buf,sizeof(buf));
-	 
-		buf[o->hid_gpio_ctl_loc] = o->hid_gpio_ctl;
-		o->lasttx=0;
-	}
-
-	/* if change in tx state as controlled by xpmr */
-	txtmp=o->pmrChan->txPttOut;
-			
-	if (o->lasttx != txtmp)
-	{
-		o->pmrChan->txPttHid=o->lasttx = txtmp;
-		if(o->debuglevel)printf("usbhid: tx set to %d\n",txtmp);
-		buf[o->hid_gpio_loc] = 0;
-		if (!o->invertptt)
-		{
-			if (txtmp) buf[o->hid_gpio_loc] = o->hid_io_ptt;
-		}
-		else
-		{
-			if (!txtmp) buf[o->hid_gpio_loc] = o->hid_io_ptt;
-		}
-		buf[o->hid_gpio_ctl_loc] = o->hid_gpio_ctl;
-		hid_set_outputs(o->usb_handle,buf);
-	}
-
-	return(0);
-}
-#endif
-/*
-*/
-static void pmrdump(struct chan_usbradio_pvt *o)
-{
-	t_pmr_chan *p;
-	int i;
-
-	p=o->pmrChan;
-
-	printf("\nodump()\n");
-
-	pd(o->devicenum);
-	ps(o->devstr);
-
-	pd(o->micmax);
-	pd(o->spkrmax);
-
-	pd(o->rxdemod);
-	pd(o->rxcdtype);
-	pd(o->rxsdtype);
-	pd(o->txtoctype);
-
-	pd(o->rxmixerset);
-	pd(o->rxboostset);
-
-	pf(o->rxvoiceadj);
-	pf(o->rxctcssadj);
-	pd(o->rxsquelchadj);
-
-	ps(o->txctcssdefault);
-	ps(o->txctcssfreq);
-
-	pd(o->numrxctcssfreqs);
-	if(o->numrxctcssfreqs>0)
-	{
-		for(i=0;i<o->numrxctcssfreqs;i++)
-		{
-			printf(" %i =  %s  %s\n",i,o->rxctcss[i],o->txctcss[i]); 
-		}
-	}
-
-	pd(o->b.rxpolarity);
-	pd(o->b.txpolarity);
-
-	pd(o->txprelim);
-	pd(o->txmixa);
-	pd(o->txmixb);
-	
-	pd(o->txmixaset);
-	pd(o->txmixbset);
-	
-	printf("\npmrdump()\n");
- 
-	pd(p->devicenum);
-
-	printf("prxSquelchAdjust=%i\n",*(o->pmrChan->prxSquelchAdjust));
-
-	pd(p->rxCarrierPoint);
-	pd(p->rxCarrierHyst);
-
-	pd(*p->prxVoiceAdjust);
-	pd(*p->prxCtcssAdjust);
-
-	pd(p->rxfreq);
-	pd(p->txfreq);
-
-	pd(p->rxCtcss->relax);
-	//pf(p->rxCtcssFreq);	
-	pd(p->numrxcodes);
-	if(o->pmrChan->numrxcodes>0)
-	{
-		for(i=0;i<o->pmrChan->numrxcodes;i++)
-		{
-			printf(" %i = %s\n",i,o->pmrChan->pRxCode[i]); 
-		}
-	}
-
-	pd(p->txTocType);
-	ps(p->pTxCodeDefault);
-	pd(p->txcodedefaultsmode);
-	pd(p->numtxcodes);
-	if(o->pmrChan->numtxcodes>0)
-	{
-		for(i=0;i<o->pmrChan->numtxcodes;i++)
-		{													 
-			printf(" %i = %s\n",i,o->pmrChan->pTxCode[i]); 
-		}
-	}
-
-	pd(p->b.rxpolarity);
-	pd(p->b.txpolarity);
-	pd(p->b.dcsrxpolarity);
-	pd(p->b.dcstxpolarity);
-	pd(p->b.lsdrxpolarity);
-	pd(p->b.lsdtxpolarity);
-
-	pd(p->txMixA);
-	pd(p->txMixB);
-    
-	pd(p->rxDeEmpEnable);
-	pd(p->rxCenterSlicerEnable);
-	pd(p->rxCtcssDecodeEnable);
-	pd(p->rxDcsDecodeEnable);
-	pd(p->b.ctcssRxEnable);
-	pd(p->b.dcsRxEnable);
-	pd(p->b.lmrRxEnable);
-	pd(p->b.dstRxEnable);
-	pd(p->smode);
-
-	pd(p->txHpfEnable);
-	pd(p->txLimiterEnable);
-	pd(p->txPreEmpEnable);
-	pd(p->txLpfEnable);
-
-	if(p->spsTxOutA)pd(p->spsTxOutA->outputGain);
-	if(p->spsTxOutB)pd(p->spsTxOutB->outputGain);
-	pd(p->txPttIn);
-	pd(p->txPttOut);
-
-	pd(p->tracetype);
-
-	return;
-}
-/*
-	takes data from a chan_usbradio_pvt struct (e.g. o->)
-	and configures the xpmr radio layer
-*/
-static int xpmr_config(struct chan_usbradio_pvt *o)
-{
-	//ast_log(LOG_NOTICE,"xpmr_config()\n");
-
-	TRACEO(1,("xpmr_config()\n"));
-
-	if(o->pmrChan==NULL)
-	{
-		ast_log(LOG_ERROR,"pmr channel structure NULL\n");
-		return 1;
-	}
-
-	o->pmrChan->rxCtcss->relax = o->rxctcssrelax;
-	o->pmrChan->txpower=0;
-
-	if(o->b.remoted)
-	{
-		o->pmrChan->pTxCodeDefault = o->set_txctcssdefault;
-		o->pmrChan->pRxCodeSrc=o->set_rxctcssfreqs;
-		o->pmrChan->pTxCodeSrc=o->set_txctcssfreqs;
-
-		o->pmrChan->rxfreq=o->set_rxfreq;
-		o->pmrChan->txfreq=o->set_txfreq;
-		/* printf(" remoted %s %s --> %s \n",o->pmrChan->txctcssdefault,
-			o->pmrChan->txctcssfreq,o->pmrChan->rxctcssfreq); */
-	}
-	else
-	{
-		// set xpmr pointers to source strings
-
-		o->pmrChan->pTxCodeDefault = o->txctcssdefault;
-		o->pmrChan->pRxCodeSrc     = o->rxctcssfreqs;
-		o->pmrChan->pTxCodeSrc     = o->txctcssfreqs;
-	
-		o->pmrChan->rxfreq = o->rxfreq;
-		o->pmrChan->txfreq = o->txfreq;
-	}
-	
-	code_string_parse(o->pmrChan);
-	if(o->pmrChan->rxfreq) o->pmrChan->b.reprog=1;
-
-	return 0;
-}
-/*
- * grab fields from the config file, init the descriptor and open the device.
- */
-static struct chan_usbradio_pvt *store_config(struct ast_config *cfg, char *ctg)
-{
-	struct ast_variable *v;
-	struct chan_usbradio_pvt *o;
-	struct ast_config *cfg1;
-	int i;
-	char fname[200];
-#ifdef	NEW_ASTERISK
-	struct ast_flags zeroflag = {0};
-#endif
-	if (ctg == NULL) {
-		traceusb1((" store_config() ctg == NULL\n"));
-		o = &usbradio_default;
-		ctg = "general";
-	} else {
-		/* "general" is also the default thing */
-		if (strcmp(ctg, "general") == 0) {
-			o = &usbradio_default;
-		} else {
-		    // ast_log(LOG_NOTICE,"ast_calloc for chan_usbradio_pvt of %s\n",ctg);
-			if (!(o = ast_calloc(1, sizeof(*o))))
-				return NULL;
-			*o = usbradio_default;
-			o->name = ast_strdup(ctg);
-			if (!usbradio_active) 
-				usbradio_active = o->name;
-		}
-	}
-	ast_mutex_init(&o->eepromlock);
-	strcpy(o->mohinterpret, "default");
-	/* fill other fields from configuration */
-	for (v = ast_variable_browse(cfg, ctg); v; v = v->next) {
-		M_START((char *)v->name, (char *)v->value);
-
-		/* handle jb conf */
-		if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
-			continue;
-
-#if	0
-			M_BOOL("autoanswer", o->autoanswer)
-			M_BOOL("autohangup", o->autohangup)
-			M_BOOL("overridecontext", o->overridecontext)
-			M_STR("context", o->ctx)
-			M_STR("language", o->language)
-			M_STR("mohinterpret", o->mohinterpret)
-			M_STR("extension", o->ext)
-			M_F("callerid", store_callerid(o, v->value))
-#endif
-			M_UINT("frags", o->frags)
-			M_UINT("queuesize",o->queuesize)
-#if 0
-			M_UINT("devicenum",o->devicenum)
-#endif
-			M_UINT("debug", usbradio_debug)
-			M_BOOL("rxcpusaver",o->rxcpusaver)
-			M_BOOL("txcpusaver",o->txcpusaver)
-			M_BOOL("invertptt",o->invertptt)
-			M_F("rxdemod",store_rxdemod(o,(char *)v->value))
-			M_BOOL("txprelim",o->txprelim);
-			M_F("txmixa",store_txmixa(o,(char *)v->value))
-			M_F("txmixb",store_txmixb(o,(char *)v->value))
-			M_F("carrierfrom",store_rxcdtype(o,(char *)v->value))
-			M_F("rxsdtype",store_rxsdtype(o,(char *)v->value))
-		    M_UINT("rxsqvox",o->rxsqvoxadj)
-			M_STR("txctcssdefault",o->txctcssdefault)
-			M_STR("rxctcssfreqs",o->rxctcssfreqs)
-			M_STR("txctcssfreqs",o->txctcssfreqs)
-			M_UINT("rxfreq",o->rxfreq)
-			M_UINT("txfreq",o->txfreq)
-			M_F("rxgain",store_rxgain(o,(char *)v->value))
- 			M_BOOL("rxboost",o->rxboostset)
-			M_UINT("rxctcssrelax",o->rxctcssrelax)
-			M_F("txtoctype",store_txtoctype(o,(char *)v->value))
-			M_UINT("hdwtype",o->hdwtype)
-			M_UINT("eeprom",o->wanteeprom)
-			M_UINT("duplex",o->radioduplex)
-			M_UINT("txsettletime",o->txsettletime)
-			M_BOOL("rxpolarity",o->b.rxpolarity)
-			M_BOOL("txpolarity",o->b.txpolarity)
-			M_BOOL("dcsrxpolarity",o->b.dcsrxpolarity)
-			M_BOOL("dcstxpolarity",o->b.dcstxpolarity)
-			M_BOOL("lsdrxpolarity",o->b.lsdrxpolarity)
-			M_BOOL("lsdtxpolarity",o->b.lsdtxpolarity)
-			M_BOOL("loopback",o->b.loopback)
-			M_BOOL("radioactive",o->b.radioactive)
-			M_UINT("rptnum",o->rptnum)
-			M_UINT("idleinterval",o->idleinterval)
-			M_UINT("turnoffs",o->turnoffs)
-			M_UINT("tracetype",o->tracetype)
-			M_UINT("tracelevel",o->tracelevel)
-			M_UINT("area",o->area)
-			M_STR("ukey",o->ukey)
-			M_END(;
-			);
-	}
-
-	o->debuglevel=0;
-
-	if (o == &usbradio_default)		/* we are done with the default */
-		return NULL;
-
-	snprintf(fname,sizeof(fname) - 1,config1,o->name);
-#ifdef	NEW_ASTERISK
-	cfg1 = ast_config_load(fname,zeroflag);
-#else
-	cfg1 = ast_config_load(fname);
-#endif
-	o->rxmixerset = 500;
-	o->txmixaset = 500;
-	o->txmixbset = 500;
-	o->rxvoiceadj = 0.5;
-	o->rxctcssadj = 0.5;
-	o->txctcssadj = 200;
-	o->rxsquelchadj = 500;
-	o->devstr[0] = 0;
-	if (cfg1 && cfg1 != CONFIG_STATUS_FILEINVALID) {
-		for (v = ast_variable_browse(cfg1, o->name); v; v = v->next) {
-	
-			M_START((char *)v->name, (char *)v->value);
-			M_UINT("rxmixerset", o->rxmixerset)
-			M_UINT("txmixaset", o->txmixaset)
-			M_UINT("txmixbset", o->txmixbset)
-			M_F("rxvoiceadj",store_rxvoiceadj(o,(char *)v->value))
-			M_F("rxctcssadj",store_rxctcssadj(o,(char *)v->value))
-			M_UINT("txctcssadj",o->txctcssadj);
-			M_UINT("rxsquelchadj", o->rxsquelchadj)
-			M_STR("devstr", o->devstr)
-			M_END(;
-			);
-		}
-		ast_config_destroy(cfg1);
-	} else ast_log(LOG_WARNING,"File %s not found, using default parameters.\n",fname);
-
-	if(o->wanteeprom)
-	{
-		ast_mutex_lock(&o->eepromlock);
-		while(o->eepromctl)
-		{
-			ast_mutex_unlock(&o->eepromlock);
-			usleep(10000);
-			ast_mutex_lock(&o->eepromlock);
-		}
-		o->eepromctl = 1;  /* request a load */
-		ast_mutex_unlock(&o->eepromlock);
-	}
-	/* if our specified one exists in the list */
-	if ((!usb_list_check(o->devstr)) || find_desc_usb(o->devstr))
-	{
-		char *s;
-
-		for(s = usb_device_list; *s; s += strlen(s) + 1)
-		{
-			if (!find_desc_usb(s)) break;
-		}
-		if (!*s)
-		{
-			ast_log(LOG_WARNING,"Unable to assign USB device for channel %s\n",o->name);
-			goto error;
-		}
-		ast_log(LOG_NOTICE,"Assigned USB device %s to usbradio channel %s\n",s,o->name);
-		strcpy(o->devstr,s);
-	}
-
-	i = usb_get_usbdev(o->devstr);
-	if (i < 0)
-	{
-	        ast_log(LOG_ERROR,"Not able to find alsa USB device\n");
-		goto error;
-	}
-	o->devicenum = i;
-
-	o->micmax = amixer_max(o->devicenum,MIXER_PARAM_MIC_CAPTURE_VOL);
-	o->spkrmax = amixer_max(o->devicenum,MIXER_PARAM_SPKR_PLAYBACK_VOL);
-	o->lastopen = ast_tvnow();	/* don't leave it 0 or tvdiff may wrap */
-	o->dsp = ast_dsp_new();
-	if (o->dsp)
-	{
-#ifdef	NEW_ASTERISK
-	  ast_dsp_set_features(o->dsp,DSP_FEATURE_DIGIT_DETECT);
-	  ast_dsp_set_digitmode(o->dsp,DSP_DIGITMODE_DTMF | DSP_DIGITMODE_MUTECONF | DSP_DIGITMODE_RELAXDTMF);
-#else
-	  ast_dsp_set_features(o->dsp,DSP_FEATURE_DTMF_DETECT);
-	  ast_dsp_digitmode(o->dsp,DSP_DIGITMODE_DTMF | DSP_DIGITMODE_MUTECONF | DSP_DIGITMODE_RELAXDTMF);
-#endif
-	}
-
-	if(o->pmrChan==NULL)
-	{
-		t_pmr_chan tChan;
-
-		// ast_log(LOG_NOTICE,"createPmrChannel() %s\n",o->name);
-		memset(&tChan,0,sizeof(t_pmr_chan));
-
-		tChan.pTxCodeDefault = o->txctcssdefault;
-		tChan.pRxCodeSrc     = o->rxctcssfreqs;
-		tChan.pTxCodeSrc     = o->txctcssfreqs;
-
-		tChan.rxDemod=o->rxdemod;
-		tChan.rxCdType=o->rxcdtype;
-		tChan.rxSqVoxAdj=o->rxsqvoxadj;
-
-		if (o->txprelim) 
-			tChan.txMod = 2;
-
-		tChan.txMixA = o->txmixa;
-		tChan.txMixB = o->txmixb;
-
-		tChan.rxCpuSaver=o->rxcpusaver;
-		tChan.txCpuSaver=o->txcpusaver;
-
-		tChan.b.rxpolarity=o->b.rxpolarity;
-		tChan.b.txpolarity=o->b.txpolarity;
-
-		tChan.b.dcsrxpolarity=o->b.dcsrxpolarity;
-		tChan.b.dcstxpolarity=o->b.dcstxpolarity;
-
-		tChan.b.lsdrxpolarity=o->b.lsdrxpolarity;
-		tChan.b.lsdtxpolarity=o->b.lsdtxpolarity;
-
-		tChan.tracetype=o->tracetype;
-		tChan.tracelevel=o->tracelevel;
-		tChan.rptnum=o->rptnum;
-		tChan.idleinterval=o->idleinterval;
-		tChan.turnoffs=o->turnoffs;
-		tChan.area=o->area;
-		tChan.ukey=o->ukey;
-		tChan.name=o->name;
-
-		o->pmrChan=createPmrChannel(&tChan,FRAME_SIZE);
-									 
-		o->pmrChan->radioDuplex=o->radioduplex;
-		o->pmrChan->b.loopback=0; 
-		o->pmrChan->txsettletime=o->txsettletime;
-		o->pmrChan->rxCpuSaver=o->rxcpusaver;
-		o->pmrChan->txCpuSaver=o->txcpusaver;
-
-		*(o->pmrChan->prxSquelchAdjust) = 
-			((999 - o->rxsquelchadj) * 32767) / 1000;
-
-		*(o->pmrChan->prxVoiceAdjust)=o->rxvoiceadj*M_Q8;
-		*(o->pmrChan->prxCtcssAdjust)=o->rxctcssadj*M_Q8;
-		o->pmrChan->rxCtcss->relax=o->rxctcssrelax;
-		o->pmrChan->txTocType = o->txtoctype;
-
-        if (    (o->txmixa == TX_OUT_LSD) ||
-                (o->txmixa == TX_OUT_COMPOSITE) ||
-                (o->txmixb == TX_OUT_LSD) ||
-                (o->txmixb == TX_OUT_COMPOSITE))
-        {
-                set_txctcss_level(o);
-        }
-
-		if( (o->txmixa!=TX_OUT_VOICE) && (o->txmixb!=TX_OUT_VOICE) &&
-			(o->txmixa!=TX_OUT_COMPOSITE) && (o->txmixb!=TX_OUT_COMPOSITE)
-		  )
-		{
-			ast_log(LOG_ERROR,"No txvoice output configured.\n");
-		}
-	
-		if( o->txctcssfreq[0] && 
-		    o->txmixa!=TX_OUT_LSD && o->txmixa!=TX_OUT_COMPOSITE  &&
-			o->txmixb!=TX_OUT_LSD && o->txmixb!=TX_OUT_COMPOSITE
-		  )
-		{
-			ast_log(LOG_ERROR,"No txtone output configured.\n");
-		}
-		
-		if(o->b.radioactive)
-		{
-		    // 20080328 sphenke asdf maw !!!
-		    // this diagnostic option was working but now appears broken
-			// it's not required for operation so I'll fix it later.
-			//struct chan_usbradio_pvt *ao;
-			//for (ao = usbradio_default.next; ao && ao->name ; ao = ao->next)ao->pmrChan->b.radioactive=0;
-			usbradio_active = o->name;
-			// o->pmrChan->b.radioactive=1;
-			//o->b.radioactive=0;
-			//o->pmrChan->b.radioactive=0;
-			ast_log(LOG_NOTICE,"radio active set to [%s]\n",o->name);
-		}
-	}
-
-	xpmr_config(o);
-
-	TRACEO(1,("store_config() 120\n"));
-	mixer_write(o);
-	TRACEO(1,("store_config() 130\n"));
-	mult_set(o);    
-	TRACEO(1,("store_config() 140\n"));
-	hidhdwconfig(o);
-
-	TRACEO(1,("store_config() 200\n"));
-
-#ifndef	NEW_ASTERISK
-	if (pipe(o->sndcmd) != 0) {
-		ast_log(LOG_ERROR, "Unable to create pipe\n");
-		goto error;
-	}
-
-	ast_pthread_create_background(&o->sthread, NULL, sound_thread, o);
-#endif
-
-	/* link into list of devices */
-	if (o != &usbradio_default) {
-		o->next = usbradio_default.next;
-		usbradio_default.next = o;
-	}
-	TRACEO(1,("store_config() complete\n"));
-	return o;
-  
-  error:
-	if (o != &usbradio_default)
-		free(o);
-	return NULL;
-}
-
-
-#if	DEBUG_FILETEST == 1
-/*
-	Test It on a File
-*/
-int RxTestIt(struct chan_usbradio_pvt *o)
-{
-	const int numSamples = SAMPLES_PER_BLOCK;
-	const int numChannels = 16;
-
-	i16 sample,i,ii;
-	
-	i32 txHangTime;
-
-	i16 txEnable;
-
-	t_pmr_chan	tChan;
-	t_pmr_chan *pChan;
-
-	FILE *hInput=NULL, *hOutput=NULL, *hOutputTx=NULL;
- 
-	i16 iBuff[numSamples*2*6], oBuff[numSamples];
-				  
-	printf("RxTestIt()\n");
-
-	pChan=o->pmrChan;
-	pChan->b.txCapture=1;
-	pChan->b.rxCapture=1;
-
-	txEnable = 0;
-
-	hInput  = fopen("/usr/src/xpmr/testdata/rx_in.pcm","r");
-	if(!hInput){
-		printf(" RxTestIt() File Not Found.\n");
-		return 0;
-	}
-	hOutput = fopen("/usr/src/xpmr/testdata/rx_debug.pcm","w");
-
-	printf(" RxTestIt() Working...\n");
-			 	
-	while(!feof(hInput))
-	{
-		fread((void *)iBuff,2,numSamples*2*6,hInput);
-		 
-		if(txHangTime)txHangTime-=numSamples;
-		if(txHangTime<0)txHangTime=0;
-		
-		if(pChan->rxCtcss->decode)txHangTime=(8000/1000*2000);
-
-		if(pChan->rxCtcss->decode && !txEnable)
-		{
-			txEnable=1;
-			//pChan->inputBlanking=(8000/1000*200);
-		}
-		else if(!pChan->rxCtcss->decode && txEnable)
-		{
-			txEnable=0;	
-		}
-
-		PmrRx(pChan,iBuff,oBuff);
-
-		if (fwrite((void *)pChan->prxDebug,2,numSamples*numChannels,hOutput) != numSamples * numChannels) {
-			ast_log(LOG_ERROR, "fwrite() failed: %s\n", strerror(errno));
-		}
-	}
-	pChan->b.txCapture=0;
-	pChan->b.rxCapture=0;
-
-	if(hInput)fclose(hInput);
-	if(hOutput)fclose(hOutput);
-
-	printf(" RxTestIt() Complete.\n");
-
-	return 0;
-}
-#endif
-
-#ifdef	NEW_ASTERISK
-
-static char *res2cli(int r)
-
-{
-	switch (r)
-	{
-	    case RESULT_SUCCESS:
-		return(CLI_SUCCESS);
-	    case RESULT_SHOWUSAGE:
-		return(CLI_SHOWUSAGE);
-	    default:
-		return(CLI_FAILURE);
-	}
-}
-
-static char *handle_console_key(struct ast_cli_entry *e,
-	int cmd, struct ast_cli_args *a)
-{
-	char *argv[] = { "radio", "key", NULL };
-
-        switch (cmd) {
-        case CLI_INIT:
-                e->command = "radio key";
-                e->usage = key_usage;
-                return NULL;
-        case CLI_GENERATE:
-                return NULL;
-	}
-	return res2cli(console_key(a->fd, 2, argv));
-}
-
-static char *handle_console_unkey(struct ast_cli_entry *e,
-	int cmd, struct ast_cli_args *a)
-{
-	char *argv[] = { "radio", "unkey", NULL };
-        switch (cmd) {
-        case CLI_INIT:
-                e->command = "radio unkey";
-                e->usage = unkey_usage;
-                return NULL;
-        case CLI_GENERATE:
-                return NULL;
-	}
-	return res2cli(console_unkey(a->fd, 2, argv));
-}
-
-static char *handle_radio_tune(struct ast_cli_entry *e,
-	int cmd, struct ast_cli_args *a)
-{
-	char *argv[5] = { "radio", "tune", a->argc > 2 ? (char *) a->argv[2] : NULL, a->argc > 3 ? (char *) a->argv[3] : NULL };
-        switch (cmd) {
-        case CLI_INIT:
-                e->command = "radio tune";
-                e->usage = radio_tune_usage;
-                return NULL;
-        case CLI_GENERATE:
-                return NULL;
-	}
-	return res2cli(radio_tune(a->fd, a->argc, argv));
-}
-
-static char *handle_radio_debug(struct ast_cli_entry *e,
-	int cmd, struct ast_cli_args *a)
-{
-        switch (cmd) {
-        case CLI_INIT:
-                e->command = "radio debug";
-                e->usage = radio_tune_usage;
-                return NULL;
-        case CLI_GENERATE:
-                return NULL;
-	}
-	return res2cli(radio_set_debug(a->fd, a->argc, NULL /* ignored */));
-}
-
-static char *handle_radio_debug_off(struct ast_cli_entry *e,
-	int cmd, struct ast_cli_args *a)
-{
-        switch (cmd) {
-        case CLI_INIT:
-                e->command = "radio debug off";
-                e->usage = radio_tune_usage;
-                return NULL;
-        case CLI_GENERATE:
-                return NULL;
-	}
-	return res2cli(radio_set_debug_off(a->fd, a->argc, NULL /* ignored */));
-}
-
-static char *handle_radio_active(struct ast_cli_entry *e,
-	int cmd, struct ast_cli_args *a)
-{
-	char *argv[4] = { "radio", "active", a->argc > 2 ? (char *) a->argv[2] : NULL, };
-        switch (cmd) {
-        case CLI_INIT:
-                e->command = "radio active";
-                e->usage = active_usage;
-                return NULL;
-        case CLI_GENERATE:
-                return NULL;
-	}
-	return res2cli(radio_active(a->fd, a->argc, argv));
-}
-
-static char *handle_set_xdebug(struct ast_cli_entry *e,
-	int cmd, struct ast_cli_args *a)
-{
-	char *argv[5] = { "radio", "set", "xdebug", a->argc == 4 ? (char *) a->argv[3] : NULL, };
-        switch (cmd) {
-        case CLI_INIT:
-                e->command = "radio set xdebug";
-                e->usage = active_usage;
-                return NULL;
-        case CLI_GENERATE:
-                return NULL;
-	}
-	return res2cli(radio_set_xpmr_debug(a->fd, a->argc, argv));
-}
-
-
-static struct ast_cli_entry cli_usbradio[] = {
-	AST_CLI_DEFINE(handle_console_key,"Simulate Rx Signal Present"),
-	AST_CLI_DEFINE(handle_console_unkey,"Simulate Rx Signal Loss"),
-	AST_CLI_DEFINE(handle_radio_tune,"Radio Tune"),
-	AST_CLI_DEFINE(handle_radio_debug,"Radio Debug On"),
-	AST_CLI_DEFINE(handle_radio_debug_off,"Radio Debug Off"),
-	AST_CLI_DEFINE(handle_radio_active,"Change commanded device"),
-	AST_CLI_DEFINE(handle_set_xdebug,"Radio set xpmr debug level")
-};
-
-#endif
-
-#include "./xpmr/xpmr.c"
-#ifdef HAVE_XPMRX
-#include "./xpmrx/xpmrx.c"
-#endif
-
-/*
-*/
-static int load_module(void)
-{
-	struct ast_config *cfg = NULL;
-	char *ctg = NULL;
-#ifdef	NEW_ASTERISK
-	struct ast_flags zeroflag = {0};
-#endif
-
-	if (!(usbradio_tech.capabilities = ast_format_cap_alloc())) {
-		return AST_MODULE_LOAD_DECLINE;
-	}
-	ast_format_cap_add(usbradio_tech.capabilities, ast_format_set(&slin, AST_FORMAT_SLINEAR, 0));
-
-	if (hid_device_mklist()) {
-		ast_log(LOG_NOTICE, "Unable to make hid list\n");
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	usb_list_check("");
-
-	usbradio_active = NULL;
-
-	/* Copy the default jb config over global_jbconf */
-	memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
-
-	/* load config file */
-#ifdef	NEW_ASTERISK
-	if (!(cfg = ast_config_load(config,zeroflag)) || cfg == CONFIG_STATUS_FILEINVALID) {
-#else
-	if (!(cfg = ast_config_load(config))) || cfg == CONFIG_STATUS_FILEINVALID {
-#endif
-		ast_log(LOG_NOTICE, "Unable to load config %s\n", config);
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	do {
-		store_config(cfg, ctg);
-	} while ( (ctg = ast_category_browse(cfg, ctg)) != NULL);
-
-	ast_config_destroy(cfg);
-
-	if (find_desc(usbradio_active) == NULL) {
-		ast_log(LOG_NOTICE, "radio active device %s not found\n", usbradio_active);
-		/* XXX we could default to 'dsp' perhaps ? */
-		/* XXX should cleanup allocated memory etc. */
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	if (ast_channel_register(&usbradio_tech)) {
-		ast_log(LOG_ERROR, "Unable to register channel type 'usb'\n");
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	ast_cli_register_multiple(cli_usbradio, ARRAY_LEN(cli_usbradio));
-
-	return AST_MODULE_LOAD_SUCCESS;
-}
-/*
-*/
-static int unload_module(void)
-{
-	struct chan_usbradio_pvt *o;
-
-	ast_log(LOG_WARNING, "unload_module() called\n");
-
-	ast_channel_unregister(&usbradio_tech);
-	ast_cli_unregister_multiple(cli_usbradio, ARRAY_LEN(cli_usbradio));
-
-	for (o = usbradio_default.next; o; o = o->next) {
-
-		ast_log(LOG_WARNING, "destroyPmrChannel() called\n");
-		if(o->pmrChan)destroyPmrChannel(o->pmrChan);
-		
-		#if DEBUG_CAPTURES == 1
-		if (frxcapraw) { fclose(frxcapraw); frxcapraw = NULL; }
-		if (frxcaptrace) { fclose(frxcaptrace); frxcaptrace = NULL; }
-		if (frxoutraw) { fclose(frxoutraw); frxoutraw = NULL; }
-		if (ftxcapraw) { fclose(ftxcapraw); ftxcapraw = NULL; }
-		if (ftxcaptrace) { fclose(ftxcaptrace); ftxcaptrace = NULL; }
-		if (ftxoutraw) { fclose(ftxoutraw); ftxoutraw = NULL; }
-		#endif
-
-		close(o->sounddev);
-#ifndef	NEW_ASTERISK
-		if (o->sndcmd[0] > 0) {
-			close(o->sndcmd[0]);
-			close(o->sndcmd[1]);
-		}
-#endif
-		if (o->dsp) ast_dsp_free(o->dsp);
-		if (o->owner)
-			ast_softhangup(o->owner, AST_SOFTHANGUP_APPUNLOAD);
-		if (o->owner)			/* XXX how ??? */
-			return -1;
-		/* XXX what about the thread ? */
-		/* XXX what about the memory allocated ? */
-	}
-
-	usbradio_tech.capabilities = ast_format_cap_destroy(usbradio_tech.capabilities);
-	return 0;
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "usb Console Channel Driver");
-
-/*	end of file */
-
-
diff --git a/channels/xpmr/sinetabx.h b/channels/xpmr/sinetabx.h
deleted file mode 100755
index 14d8f9f4c..000000000
--- a/channels/xpmr/sinetabx.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * sinetabx.h - for Xelatec Private Mobile Radio Processes
- * 
- * All Rights Reserved. Copyright (C)2007, Xelatec, LLC
- * 
- * 20070808 1235 Steven Henke, W9SH, sph@xelatec.com
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- * 		 
- * This version may be optionally licenced under the GNU LGPL licence.
- *
- * A license has been granted to Digium (via disclaimer) for the use of
- * this code.
- *
- */
-
-/*! \file
- *
- * \brief Private Land Mobile Radio Channel Voice and Signaling Processor
- *
- * \author Steven Henke, W9SH <sph@xelatec.com> Xelatec, LLC
- */
-
-#ifndef XPMR_SINETABX_H
-#define XPMR_SINETABX_H 	1
-		
-#define SAMPLES_PER_SINE 256		
-		
-static const i16 sinetablex[]={		
-0,			// 0
-804,		// 1
-1608,		// 2
-2410,		// 3
-3212,		// 4
-4011,		// 5
-4808,		// 6
-5602,		// 7
-6393,		// 8
-7179,		// 9
-7962,		// 10
-8739,		// 11
-9512,		// 12
-10278,		// 13
-11039,		// 14
-11793,		// 15
-12539,		// 16
-13279,		// 17
-14010,		// 18
-14732,		// 19
-15446,		// 20
-16151,		// 21
-16846,		// 22
-17530,		// 23
-18204,		// 24
-18868,		// 25
-19519,		// 26
-20159,		// 27
-20787,		// 28
-21403,		// 29
-22005,		// 30
-22594,		// 31
-23170,		// 32
-23731,		// 33
-24279,		// 34
-24811,		// 35
-25329,		// 36
-25832,		// 37
-26319,		// 38
-26790,		// 39
-27245,		// 40
-27683,		// 41
-28105,		// 42
-28510,		// 43
-28898,		// 44
-29268,		// 45
-29621,		// 46
-29956,		// 47
-30273,		// 48
-30571,		// 49
-30852,		// 50
-31113,		// 51
-31356,		// 52
-31580,		// 53
-31785,		// 54
-31971,		// 55
-32137,		// 56
-32285,		// 57
-32412,		// 58
-32521,		// 59
-32609,		// 60
-32678,		// 61
-32728,		// 62
-32757,		// 63
-32767,		// 64
-32757,		// 65
-32728,		// 66
-32678,		// 67
-32609,		// 68
-32521,		// 69
-32412,		// 70
-32285,		// 71
-32137,		// 72
-31971,		// 73
-31785,		// 74
-31580,		// 75
-31356,		// 76
-31113,		// 77
-30852,		// 78
-30571,		// 79
-30273,		// 80
-29956,		// 81
-29621,		// 82
-29268,		// 83
-28898,		// 84
-28510,		// 85
-28105,		// 86
-27683,		// 87
-27245,		// 88
-26790,		// 89
-26319,		// 90
-25832,		// 91
-25329,		// 92
-24811,		// 93
-24279,		// 94
-23731,		// 95
-23170,		// 96
-22594,		// 97
-22005,		// 98
-21403,		// 99
-20787,		// 100
-20159,		// 101
-19519,		// 102
-18868,		// 103
-18204,		// 104
-17530,		// 105
-16846,		// 106
-16151,		// 107
-15446,		// 108
-14732,		// 109
-14010,		// 110
-13279,		// 111
-12539,		// 112
-11793,		// 113
-11039,		// 114
-10278,		// 115
-9512,		// 116
-8739,		// 117
-7962,		// 118
-7179,		// 119
-6393,		// 120
-5602,		// 121
-4808,		// 122
-4011,		// 123
-3212,		// 124
-2410,		// 125
-1608,		// 126
-804,		// 127
-0,			// 128
--804,		// 129
--1608,		// 130
--2410,		// 131
--3212,		// 132
--4011,		// 133
--4808,		// 134
--5602,		// 135
--6393,		// 136
--7179,		// 137
--7962,		// 138
--8739,		// 139
--9512,		// 140
--10278,		// 141
--11039,		// 142
--11793,		// 143
--12539,		// 144
--13279,		// 145
--14010,		// 146
--14732,		// 147
--15446,		// 148
--16151,		// 149
--16846,		// 150
--17530,		// 151
--18204,		// 152
--18868,		// 153
--19519,		// 154
--20159,		// 155
--20787,		// 156
--21403,		// 157
--22005,		// 158
--22594,		// 159
--23170,		// 160
--23731,		// 161
--24279,		// 162
--24811,		// 163
--25329,		// 164
--25832,		// 165
--26319,		// 166
--26790,		// 167
--27245,		// 168
--27683,		// 169
--28105,		// 170
--28510,		// 171
--28898,		// 172
--29268,		// 173
--29621,		// 174
--29956,		// 175
--30273,		// 176
--30571,		// 177
--30852,		// 178
--31113,		// 179
--31356,		// 180
--31580,		// 181
--31785,		// 182
--31971,		// 183
--32137,		// 184
--32285,		// 185
--32412,		// 186
--32521,		// 187
--32609,		// 188
--32678,		// 189
--32728,		// 190
--32757,		// 191
--32767,		// 192
--32757,		// 193
--32728,		// 194
--32678,		// 195
--32609,		// 196
--32521,		// 197
--32412,		// 198
--32285,		// 199
--32137,		// 200
--31971,		// 201
--31785,		// 202
--31580,		// 203
--31356,		// 204
--31113,		// 205
--30852,		// 206
--30571,		// 207
--30273,		// 208
--29956,		// 209
--29621,		// 210
--29268,		// 211
--28898,		// 212
--28510,		// 213
--28105,		// 214
--27683,		// 215
--27245,		// 216
--26790,		// 217
--26319,		// 218
--25832,		// 219
--25329,		// 220
--24811,		// 221
--24279,		// 222
--23731,		// 223
--23170,		// 224
--22594,		// 225
--22005,		// 226
--21403,		// 227
--20787,		// 228
--20159,		// 229
--19519,		// 230
--18868,		// 231
--18204,		// 232
--17530,		// 233
--16846,		// 234
--16151,		// 235
--15446,		// 236
--14732,		// 237
--14010,		// 238
--13279,		// 239
--12539,		// 240
--11793,		// 241
--11039,		// 242
--10278,		// 243
--9512,		// 244
--8739,		// 245
--7962,		// 246
--7179,		// 247
--6393,		// 248
--5602,		// 249
--4808,		// 250
--4011,		// 251
--3212,		// 252
--2410,		// 253
--1608,		// 254
--804,		// 255
-};
-
-#endif /* !XPMR_SINETABX_H */
diff --git a/channels/xpmr/xpmr.c b/channels/xpmr/xpmr.c
deleted file mode 100755
index 4bfc2c561..000000000
--- a/channels/xpmr/xpmr.c
+++ /dev/null
@@ -1,3325 +0,0 @@
-/*
- * xpmr.c - Xelatec Private Mobile Radio Processes
- *
- * All Rights Reserved. Copyright (C)2007, Xelatec, LLC
- *
- * 20070808 1235 Steven Henke, W9SH, sph@xelatec.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * This version may be optionally licenced under the GNU LGPL licence.
- *
- * A license has been granted to Digium (via disclaimer) for the use of
- * this code.
- *
- * 20080118 0800 sph@xelatec.com major fixes and features
- */
-
-/*! \file
- *
- * \brief Private Land Mobile Radio Channel Voice and Signaling Processor
- *
- * \author Steven Henke, W9SH <sph@xelatec.com> Xelatec, LLC
- */
-/*
-	FYI 	= For Your Information
-	PMR 	= Private Mobile Radio
-	RX  	= Receive
-	TX  	= Transmit
-	CTCSS	= Continuous Tone Coded Squelch System
-	TONE	= Same as above.
-	LSD 	= Low Speed Data, subaudible signaling. May be tones or codes.
-	VOX 	= Voice Operated Transmit
-	DSP 	= Digital Signal Processing
-	LPF 	= Low Pass Filter
-	FIR 	= Finite Impulse Response (Filter)
-	IIR 	= Infinite Impulse Response (Filter)
-*/
-
-// XPMR_FILE_VERSION(__FILE__, "$Revision$")
-
-#include <stdio.h>
-#include <ctype.h>
-#include <math.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#ifdef HAVE_SYS_IO_H
-#include <sys/io.h>
-#endif
-#include <fcntl.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <errno.h>
-	   
-#include "xpmr.h"
-#include "xpmr_coef.h"
-#include "sinetabx.h"
-
-static i16 pmrChanIndex=0;	 			// count of created pmr instances
-//static i16 pmrSpsIndex=0;
-
-#if (DTX_PROG == 1) || 	XPMR_PPTP == 1
-static int ppdrvdev=0;
-#endif
-
-/*
-	Trace Routines
-*/
-void strace(i16 point, t_sdbg *sdbg, i16 idx, i16 value)
-{
-	// make dbg_trace buffer in structure
-	if(!sdbg->mode || sdbg->point[point]<0){
-		return;
-    } else {
-		sdbg->buffer[(idx*XPMR_DEBUG_CHANS) + sdbg->point[point]] = value;
-	}
-}
-/*
-
-*/
-void strace2(t_sdbg *sdbg)
-{
-	int i;
-	for(i=0;i<XPMR_DEBUG_CHANS;i++)
-	{
-		if(sdbg->source[i])
-		{
-			int ii;
-			for(ii=0;ii<SAMPLES_PER_BLOCK;ii++)
-			{
-				sdbg->buffer[ii*XPMR_DEBUG_CHANS + i] = sdbg->source[i][ii];
-		    }
-		}
-	}
-}
-#if XPMR_PPTP == 1
-/*
-	Hardware Trace Signals via the PC Parallel Port
-*/
-void	pptp_init (void)
-{
-	if (ppdrvdev == 0)
-    	ppdrvdev = open("/dev/ppdrv_device", 0);
-
-    if (ppdrvdev < 0)
-    {
-        ast_log(LOG_ERROR, "open /dev/ppdrv_ppdrvdev returned %i\n",ppdrvdev);
-		exit(0);
-	}
-	ioctl(ppdrvdev, PPDRV_IOC_PINMODE_OUT, DTX_CLK | DTX_DATA | DTX_ENABLE | DTX_TXPWR | DTX_TX | DTX_TP1 | DTX_TP2);
-	ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR,    DTX_CLK | DTX_DATA | DTX_ENABLE | DTX_TXPWR | DTX_TX | DTX_TP1 | DTX_TP2);
-}
-/*
-*/
-void	pptp_write(i16 bit, i16 state)
-{
-	if(bit==0)
-	{
-		if(state)ioctl(ppdrvdev,PPDRV_IOC_PINSET,DTX_TP1);
-		else ioctl(ppdrvdev,PPDRV_IOC_PINCLEAR,DTX_TP1);
-	}
-	else
-	{
-		if(state)ioctl(ppdrvdev,PPDRV_IOC_PINSET,DTX_TP2);
-		else ioctl(ppdrvdev,PPDRV_IOC_PINCLEAR,DTX_TP2);
-	}
-}
-#endif
-/*
-	take source string allocate and copy
-	copy is modified, delimiters are replaced with zeros to mark
-	end of string
-	count set pointers
-	string_parse( char *src, char *dest, char **sub)
-*/
-i16 string_parse(char *src, char **dest, char ***ptrs)
-{
-	char *p,*pd;
-	char *ptstr[1000];
-	i16 i, slen, numsub;
-
-	TRACEJ(2,("string_parse(%s)\n",src));
-
-	slen=strlen(src);
-	TRACEJ(2,(" source len = %i\n",slen));
-
-	pd=*dest;
-	free(pd);
-    pd=calloc(slen+1,1);
-	memcpy(pd,src,slen);
-	*dest=pd;
-
-	p=0;
-	numsub=0;
-	for(i=0;i<slen+1;i++)
-	{
-		TRACEJ(5,(" pd[%i] = %c\n",i,pd[i]));
-
-		if( p==0 && pd[i]!=',' && pd[i]!=' ' )
-		{
-			p=&(pd[i]);	
-		}
-		else if(pd[i]==',' || pd[i]==0 )
-		{
-			ptstr[numsub]=p;
-			pd[i]=0;
-			p=0;
-			numsub++;
-		}
-	}
-
-	for(i=0;i<numsub;i++)
-	{
-		TRACEJ(5,(" ptstr[%i] = %p %s\n",i,ptstr[i],ptstr[i]));
-	}
-
-	if(*ptrs)free(*ptrs);
-	*ptrs=calloc(numsub,4);
-	for(i=0;i<numsub;i++)
-	{
-		(*ptrs)[i]=ptstr[i];	
-		TRACEJ(5,(" %i = %s\n",i,(*ptrs)[i]));
-	}
-	TRACEJ(5,("string_parse()=%i\n\n",numsub));
-
-	return numsub;
-}
-/*
-	the parent program defines
-	pRxCodeSrc and pTxCodeSrc string pointers to the list of codes
-	pTxCodeDefault the default Tx Code.
-
-*/
-i16 code_string_parse(t_pmr_chan *pChan)
-{
-	i16 i, ii, hit, ti;
-	char *p;
-	float f, maxctcsstxfreq;
-
-	t_pmr_sps  	*pSps;
-	i16	maxctcssindex;
-
-	TRACEF(1,("code_string_parse(%i)\n",0)); 
-	TRACEF(1,("pChan->pRxCodeSrc %s \n",pChan->pRxCodeSrc));
-	TRACEF(1,("pChan->pTxCodeSrc %s \n",pChan->pTxCodeSrc));
-	TRACEF(1,("pChan->pTxCodeDefault %s \n",pChan->pTxCodeDefault));
-
-	//printf("code_string_parse() %s / %s / %s / %s \n",pChan->name, pChan->pTxCodeDefault,pChan->pTxCodeSrc,pChan->pRxCodeSrc);
-
- 	maxctcssindex=CTCSS_NULL;
-	maxctcsstxfreq=CTCSS_NULL;
-	pChan->txctcssdefault_index=CTCSS_NULL;
-	pChan->txctcssdefault_value=CTCSS_NULL;
-
-	pChan->b.ctcssRxEnable=pChan->b.ctcssTxEnable=0;
-	pChan->b.dcsRxEnable=pChan->b.dcsTxEnable=0;
-	pChan->b.lmrRxEnable=pChan->b.lmrTxEnable=0;
-	pChan->b.mdcRxEnable=pChan->b.mdcTxEnable=0;
-	pChan->b.dstRxEnable=pChan->b.dstTxEnable=0;
-	pChan->b.p25RxEnable=pChan->b.p25TxEnable=0;
-
-	if(pChan->spsLsdGen){
-		pChan->spsLsdGen->enabled=0;
-		pChan->spsLsdGen->state=0;
-	}
-
-	TRACEF(1,("code_string_parse(%i) 05\n",0));
-
-	pChan->numrxcodes = string_parse( pChan->pRxCodeSrc, &(pChan->pRxCodeStr), &(pChan->pRxCode));
-	pChan->numtxcodes = string_parse( pChan->pTxCodeSrc, &(pChan->pTxCodeStr), &(pChan->pTxCode));
-
-	if(pChan->numrxcodes!=pChan->numtxcodes)printf("ERROR: numrxcodes != numtxcodes \n");
-	
-	pChan->rxCtcss->enabled=0;
-	pChan->rxCtcss->gain=1*M_Q8;
-	pChan->rxCtcss->limit=8192;
-	pChan->rxCtcss->input=pChan->pRxLsdLimit;
-	pChan->rxCtcss->decode=CTCSS_NULL;
-
-	pChan->rxCtcss->testIndex=0;
-	if(!pChan->rxCtcss->testIndex)pChan->rxCtcss->testIndex=3;
-
-	pChan->rxctcssfreq[0]=0;	// decode now	CTCSS_RXONLY
-
-	for(i=0;i<CTCSS_NUM_CODES;i++)
-	{
-		pChan->rxctcss[i]=0;
-		pChan->txctcss[i]=0;
-		pChan->rxCtcssMap[i]=CTCSS_NULL;
-	}
-
-	TRACEF(1,("code_string_parse(%i) 10\n",0));
-	
-	#ifdef XPMRX_H
-	xpmrx(pChan,XXO_LSDCODEPARSE);
-	#endif
-
-	// Do Receive Codes String
-	for(i=0;i<pChan->numrxcodes;i++)
-	{
-		i16 ri,_ti;
-		float _f;
-
- 		p=pChan->pStr=pChan->pRxCode[i];
-
-		#ifdef HAVE_XPMRX
-		if(!xpmrx(pChan,XXO_LSDCODEPARSE_1))
-		#endif
-		{
-			sscanf(p, "%30f", &_f);
-			ri=CtcssFreqIndex(_f);
-			if(ri>maxctcssindex)maxctcssindex=ri;
-
-			sscanf(pChan->pTxCode[i], "%30f", &_f);
-		    _ti=CtcssFreqIndex(_f);
-			if(_f>maxctcsstxfreq)maxctcsstxfreq=_f;
-
-			if(ri>CTCSS_NULL && _ti>CTCSS_NULL)
-			{
-				pChan->b.ctcssRxEnable=pChan->b.ctcssTxEnable=1;
-				pChan->rxCtcssMap[ri]=_ti;
-				pChan->numrxctcssfreqs++;
-				TRACEF(1,("pChan->rxctcss[%i]=%s  pChan->rxCtcssMap[%i]=%i\n",i,pChan->rxctcss[i],ri,_ti));
-			}
-			else if(ri>CTCSS_NULL && _f==0)
-			{
-				pChan->b.ctcssRxEnable=1;
-				pChan->rxCtcssMap[ri]=CTCSS_RXONLY;
-				pChan->numrxctcssfreqs++;
-				TRACEF(1,("pChan->rxctcss[%i]=%s  pChan->rxCtcssMap[%i]=%i RXONLY\n",i,pChan->rxctcss[i],ri,_ti));
-			}
-			else
-			{
-				i16 _ii;
-				pChan->numrxctcssfreqs=0;
-				for(_ii=0;_ii<CTCSS_NUM_CODES;_ii++) pChan->rxCtcssMap[_ii]=CTCSS_NULL;
-				TRACEF(1,("WARNING: Invalid Channel code detected and ignored. %i %s %s \n",i,pChan->pRxCode[i],pChan->pTxCode[i]));
-			}
-		}
-	}
-
-	TRACEF(1,("code_string_parse() CTCSS Init Struct  %i  %i\n",pChan->b.ctcssRxEnable,pChan->b.ctcssTxEnable));
-	if(pChan->b.ctcssRxEnable)
-	{
-		pChan->rxHpfEnable=1;
-		pChan->spsRxLsdNrz->enabled=pChan->rxCenterSlicerEnable=1;
-		pChan->rxCtcssDecodeEnable=1;
-		pChan->rxCtcss->enabled=1;
-	}
-	else
-	{
-		pChan->rxHpfEnable=1;
-		pChan->spsRxLsdNrz->enabled=pChan->rxCenterSlicerEnable=0;
-		pChan->rxCtcssDecodeEnable=0;
-		pChan->rxCtcss->enabled=0;
-	}
-
-	TRACEF(1,("code_string_parse() CTCSS Init Decoders \n"));
-	for(i=0;i<CTCSS_NUM_CODES;i++)
-	{
-		t_tdet *ptdet;
-		ptdet=&(pChan->rxCtcss->tdet[i]);
-		ptdet->counterFactor=coef_ctcss_div[i];
-		ptdet->state=1;
-		ptdet->setpt=(M_Q15*0.041);		   			// 0.069
-		ptdet->hyst =(M_Q15*0.0130);
-		ptdet->binFactor=(M_Q15*0.135);			  	// was 0.140
-		ptdet->fudgeFactor=8;
-	}
-
-
-	// DEFAULT TX CODE
-	TRACEF(1,("code_string_parse() Default Tx Code %s \n",pChan->pTxCodeDefault));
-	pChan->txcodedefaultsmode=SMODE_NULL;
-	p=pChan->pStr=pChan->pTxCodeDefault;
-
-	#ifdef HAVE_XPMRX
-	if(!lsd_code_parse(pChan,3))
-	#endif
-	{
-		sscanf(p, "%30f", &f);
-	    ti=CtcssFreqIndex(f);
-		if(f>maxctcsstxfreq)maxctcsstxfreq=f;
-
-		if(ti>CTCSS_NULL)
-		{
-			pChan->b.ctcssTxEnable=1;
-			pChan->txctcssdefault_index=ti;
-			pChan->txctcssdefault_value=f;
-			pChan->spsSigGen0->freq=f*10;
-			pChan->txcodedefaultsmode=SMODE_CTCSS;
-			TRACEF(1,("code_string_parse() Tx Default CTCSS = %s %i %f\n",p,ti,f));
-		}
-	}
-
-
-	// set x for maximum length and just change pointers
-	TRACEF(1,("code_string_parse() Filter Config \n"));
-	pSps=pChan->spsTxLsdLpf;
-	if(pSps->x)free(pSps->x);
-	if(maxctcsstxfreq>203.5)
-	{
-		pSps->ncoef=taps_fir_lpf_250_9_66;
-		pSps->size_coef=2;
-		pSps->coef=(void*)coef_fir_lpf_250_9_66;
-		pSps->nx=taps_fir_lpf_250_9_66;
-		pSps->size_x=2;
-		pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-		pSps->calcAdjust=gain_fir_lpf_250_9_66;
-		TRACEF(1,("code_string_parse() Tx Filter Freq High\n"));
-	}
-	else
-	{
-		pSps->ncoef=taps_fir_lpf_215_9_88;
-		pSps->size_coef=2;
-		pSps->coef=(void*)coef_fir_lpf_215_9_88;
-		pSps->nx=taps_fir_lpf_215_9_88;
-		pSps->size_x=2;
-		pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-		pSps->calcAdjust=gain_fir_lpf_215_9_88;
-		TRACEF(1,("code_string_parse() Tx Filter Freq Low\n"));
-	}
-
-	// CTCSS Rx Decoder Low Pass Filter
-	hit=0;
-	ii=	CtcssFreqIndex(203.5);
-	for(i=ii;i<CTCSS_NUM_CODES;i++)
-	{
-		if(pChan->rxCtcssMap[i]>CTCSS_NULL)hit=1;
-	}
-
-	pSps=pChan->spsRxLsd;
-	if(pSps->x)free(pSps->x);
-	if(hit)
-	{
-		pSps->ncoef=taps_fir_lpf_250_9_66;
-		pSps->size_coef=2;
-		pSps->coef=(void*)coef_fir_lpf_250_9_66;
-		pSps->nx=taps_fir_lpf_250_9_66;
-		pSps->size_x=2;
-		pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-		pSps->calcAdjust=gain_fir_lpf_250_9_66;
-		TRACEF(1,("code_string_parse() Rx Filter Freq High\n"));
-	}
-	else
-	{
-		pSps->ncoef=taps_fir_lpf_215_9_88;
-		pSps->size_coef=2;
-		pSps->coef=(void*)coef_fir_lpf_215_9_88;
-		pSps->nx=taps_fir_lpf_215_9_88;
-		pSps->size_x=2;
-		pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-		pSps->calcAdjust=gain_fir_lpf_215_9_88;
-		TRACEF(1,("code_string_parse() Rx Filter Freq Low\n"));
-	}
-
-	if(pChan->b.ctcssRxEnable || pChan->b.dcsRxEnable || pChan->b.lmrRxEnable)
-	{
-		pChan->rxCenterSlicerEnable=1;
-		pSps->enabled=1;
-	}
-	else
-	{
-		pChan->rxCenterSlicerEnable=0;
-		pSps->enabled=0;
-	}
-
-	#if XPMR_DEBUG0 == 1
-	TRACEF(2,("code_string_parse() ctcssRxEnable = %i \n",pChan->b.ctcssRxEnable));
-	TRACEF(2,("                    ctcssTxEnable = %i \n",pChan->b.ctcssTxEnable));
-	TRACEF(2,("                      dcsRxEnable = %i \n",pChan->b.dcsRxEnable));
-	TRACEF(2,("                      lmrRxEnable = %i \n",pChan->b.lmrRxEnable));
-	TRACEF(2,("               txcodedefaultsmode = %i \n",pChan->txcodedefaultsmode));
-	for(i=0;i<CTCSS_NUM_CODES;i++)
-	{
-		TRACEF(2,("rxCtcssMap[%i] = %i \n",i,pChan->rxCtcssMap[i]));
-	}
-    #endif
-
-	#ifdef HAVE_XPMRX
-	lsd_code_parse(pChan,5);
-	#endif
-
-	TRACEF(1,("code_string_parse(%i) end\n",0));
-
-	return 0;
-}
-/*
-	Convert a Frequency in Hz to a zero based CTCSS Table index
-*/
-i16 CtcssFreqIndex(float freq)
-{
-	i16 i,hit=CTCSS_NULL;
-
-	for(i=0;i<CTCSS_NUM_CODES;i++){
-		if(freq==freq_ctcss[i])hit=i;
-	}
-	return hit;
-}
-/*
-	pmr_rx_frontend
-	Takes a block of data and low pass filters it.
-	Determines the amplitude of high frequency noise for carrier detect.
-	Decimates input data to change the rate.
-*/
-i16 pmr_rx_frontend(t_pmr_sps *mySps)
-{
-	#define DCgainBpfNoise 	65536
-
-	i16 samples,iOutput, *input, *output, *noutput;
-	i16 *x, *coef;
-    i32 i, naccum, outputGain, calcAdjust;
-	i64 y;
-	i16 nx, hyst, setpt, compOut;
-	i16 amax, amin, apeak, discounteru, discounterl, discfactor;
-	i16 decimator, decimate, doNoise;
-
-	TRACEJ(5,("pmr_rx_frontend()\n"));
-
-	if(!mySps->enabled)return(1);
-
-	decimator = mySps->decimator;
-	decimate = mySps->decimate;
-
-	input     = mySps->source;
-	output    = mySps->sink;
-	noutput   = mySps->parentChan->pRxNoise;
-
-	nx        = mySps->nx;
-	coef      = mySps->coef;
-
-	calcAdjust = mySps->calcAdjust;
-	outputGain = mySps->outputGain;
-
-	amax=mySps->amax;
-	amin=mySps->amin;
-	apeak=mySps->apeak;
- 	discounteru=mySps->discounteru;
-	discounterl=mySps->discounterl;
-	discfactor=mySps->discfactor;
-	setpt=mySps->setpt;
-	hyst=mySps->hyst;
-	compOut=mySps->compOut;
-
-	samples=mySps->nSamples*decimate;
-	x=mySps->x;
-	iOutput=0;
-
-	if(mySps->parentChan->rxCdType!=CD_XPMR_VOX)doNoise=1;
-	else doNoise=0;
-
-	for(i=0;i<samples;i++)
-	{
-		i16 n;
-
-		//shift the old samples
-	    for(n=nx-1; n>0; n--)
-	       x[n] = x[n-1];
-
-	    x[0] = input[i*2];
-
-		--decimator;
-
-		if(decimator<=0)
-		{
-			decimator=decimate;
-
-		    y=0;
-		    for(n=0; n<nx; n++)
-		        y += coef[n] * x[n];
-
-		    y=((y/calcAdjust)*outputGain)/M_Q8;
-
-			if(y>32767)y=32767;
-			else if(y<-32767)y=-32767;
-
-		    output[iOutput]=y;					// Rx Baseband decimated
-			noutput[iOutput++] = apeak;		  	// Rx Noise
-		}
-
-		if(doNoise)
-		{
-			// calculate noise output
-			naccum=0;
-		    for(n=0; n<nx; n++)
-		        naccum += coef_fir_bpf_noise_1[n] * x[n];
-
-		    naccum /= DCgainBpfNoise;
-
-			if(naccum>amax)
-			{
-				amax=naccum;
-				discounteru=discfactor;
-			}
-			else if(--discounteru<=0)
-			{
-				discounteru=discfactor;
-				amax=(i32)((amax*32700)/32768);
-			}
-
-			if(naccum<amin)
-			{
-				amin=naccum;
-				discounterl=discfactor;
-			}
-			else if(--discounterl<=0)
-			{
-				discounterl=discfactor;
-				amin=(i32)((amin*32700)/32768);
-			}
-
-			apeak=(amax-amin)/2;
-
-		}  // if doNoise
-	}
-
-	if(doNoise)
-	{
-		((t_pmr_chan *)(mySps->parentChan))->rxRssi=apeak;
-
-		if(apeak>setpt || (compOut&&(apeak>(setpt-hyst)))) compOut=1;
-		else compOut=0;
-		mySps->compOut=compOut;
-		mySps->amax=amax;
-		mySps->amin=amin;
-		mySps->apeak=apeak;
-	 	mySps->discounteru=discounteru;
-		mySps->discounterl=discounterl;
-	}
-
-	return 0;
-}
-/*
-	pmr general purpose fir
-	works on a block of samples
-*/
-i16 pmr_gp_fir(t_pmr_sps *mySps)
-{
-	i32 nsamples,inputGain,outputGain,calcAdjust;
-	i16 *input, *output;
-	i16 *x, *coef;
-    i32 i, ii;
-	i16 nx, hyst, setpt, compOut;
-	i16 amax, amin, apeak=0, discounteru=0, discounterl=0, discfactor;
-	i16 decimator, decimate, interpolate;
-	i16 numChanOut, selChanOut, mixOut, monoOut;
-
-	TRACEJ(5,("pmr_gp_fir() %i %i\n",mySps->index, mySps->enabled));
-
-	if(!mySps->enabled)return(1);
-
-	inputGain  = mySps->inputGain;
-	calcAdjust = mySps->calcAdjust;
-	outputGain = mySps->outputGain;
-
-	input      = mySps->source;
-	output     = mySps->sink;
-	x          = mySps->x;
-	nx         = mySps->nx;
-	coef       = mySps->coef;
-
-	decimator   = mySps->decimator;
-	decimate 	= mySps->decimate;
-	interpolate = mySps->interpolate;
-
-	setpt	   = mySps->setpt;
-	compOut    = mySps->compOut;
-
-	inputGain  = mySps->inputGain;
-	outputGain = mySps->outputGain;
-	numChanOut = mySps->numChanOut;
-	selChanOut = mySps->selChanOut;
-	mixOut     = mySps->mixOut;
-	monoOut    = mySps->monoOut;
-
-	amax=mySps->amax;
-	amin=mySps->amin;
-
-	discfactor=mySps->discfactor;
-	hyst=mySps->hyst;
-	setpt=mySps->setpt;
-	nsamples=mySps->nSamples;
-
-	if(mySps->option==3)
-	{
-		mySps->option=0;
-		mySps->enabled=0;
-		for(i=0;i<nsamples;i++)
-		{
-			if(monoOut)
-				output[(i*2)]=output[(i*2)+1]=0;
-			else
-				output[(i*numChanOut)+selChanOut]=0;
-		}
-		return 0;
-	}
-
-	ii=0;
-	for(i=0;i<nsamples;i++)
-	{
-		int ix;
-
-		int64_t y=0;
-
-		if(decimate<0)
-		{
-			decimator=decimate;
-		}
-
-		for(ix=0;ix<interpolate;ix++)
-		{
-			i16 n;
-			y=0;
-
-		    for(n=nx-1; n>0; n--)
-		       x[n] = x[n-1];
-		    x[0] = (input[i]*inputGain)/M_Q8;
-
-			#if 0
-			--decimator;
-			if(decimator<=0)
-			{
-				decimator=decimate;
-			    for(n=0; n<nx; n++)
-			        y += coef[n] * x[n];
-				y /= (outputGain*3);
-				output[ii++]=y;
-			}
-		 	#else
-		    for(n=0; n<nx; n++)
-		        y += coef[n] * x[n];
-
-			y=((y/calcAdjust)*outputGain)/M_Q8;
-
-			if(mixOut){
-				if(monoOut){
-					output[(ii*2)]=output[(ii*2)+1]+=y;
-				}
-				else{
-					output[(ii*numChanOut)+selChanOut]+=y;
-				}
-			}
-			else{
-				if(monoOut){
-					output[(ii*2)]=output[(ii*2)+1]=y;
-				}
-				else{
-					output[(ii*numChanOut)+selChanOut]=y;
-				}
-			}
-			ii++;
-		    #endif
-		}
-
-		// amplitude detector
-		if(setpt)
-		{
-			i16 accum=y;
-
-			if(accum>amax)
-			{
-				amax=accum;
-				discounteru=discfactor;
-			}
-			else if(--discounteru<=0)
-			{
-				discounteru=discfactor;
-				amax=(i32)((amax*32700)/32768);
-			}
-
-			if(accum<amin)
-			{
-				amin=accum;
-				discounterl=discfactor;
-			}
-			else if(--discounterl<=0)
-			{
-				discounterl=discfactor;
-				amin=(i32)((amin*32700)/32768);
-			}
-
-			apeak = (i32)(amax-amin)/2;
-
- 			if(apeak>setpt)compOut=1;
-			else if(compOut&&(apeak<(setpt-hyst)))compOut=0;
-		}
-	}
-
-	mySps->decimator = decimator;
-
-	mySps->amax=amax;
-	mySps->amin=amin;
-	mySps->apeak=apeak;
- 	mySps->discounteru=discounteru;
-	mySps->discounterl=discounterl;
-
-	mySps->compOut=compOut;
-
-	return 0;
-}
-/*
-	general purpose integrator lpf
-*/
-i16 gp_inte_00(t_pmr_sps *mySps)
-{
-	i16 npoints;
- 	i16 *input, *output;
-
-	i32 outputGain;
-	i32	i;
-	i32 accum;
-
-	i32 state00;
- 	i16 coeff00, coeff01;
-
-	TRACEJ(5,("gp_inte_00() %i\n",mySps->enabled));
-	if(!mySps->enabled)return(1);
-
-	input   = mySps->source;
-	output	= mySps->sink;
-
-	npoints=mySps->nSamples;
-
-	outputGain=mySps->outputGain;
-
-	coeff00=((i16*)mySps->coef)[0];
-	coeff01=((i16*)mySps->coef)[1];
-	state00=((i32*)mySps->x)[0];
-
-	// note fixed gain of 2 to compensate for attenuation
-	// in passband
-
-	for(i=0;i<npoints;i++)
-	{
-		accum=input[i];
-		state00 = accum + (state00*coeff01)/M_Q15;
-		accum = (state00*coeff00)/(M_Q15/4);
-		output[i]=(accum*outputGain)/M_Q8;
-	}
-
-	((i32*)(mySps->x))[0]=state00;
-
-	return 0;
-}
-/*
-	general purpose differentiator hpf
-*/
-i16 gp_diff(t_pmr_sps *mySps)
-{
- 	i16 *input, *output;
-	i16 npoints;
-	i32 outputGain, calcAdjust;
-	i32	i;
-	i32 temp0,temp1;
- 	i16 x0;
-	i32 _y0;
-	i16 a0,a1;
-	i16 *coef;
-	i16 *x;
-
-	input   = mySps->source;
-	output	= mySps->sink;
-
-	npoints=mySps->nSamples;
-
-	outputGain=mySps->outputGain;
-	calcAdjust=mySps->calcAdjust;
-
-	coef=(i16*)(mySps->coef);
-	x=(i16*)(mySps->x);
-	a0=coef[0];
-	a1=coef[1];
-
-	x0=x[0];
-
-	TRACEJ(5,("gp_diff()\n"));
-
-  	for (i=0;i<npoints;i++)
-    {
-		temp0 =	x0 * a1;
-		   x0 = input[i];
-		temp1 = input[i] * a0;
-		  _y0 = (temp0 + temp1)/calcAdjust;
-		  _y0 = (_y0*outputGain)/M_Q8;
-		
-		if(_y0>32766)_y0=32766;
-		else if(_y0<-32766)_y0=-32766;
-        output[i]=_y0;
-    }
-
-	x[0]=x0;
-
-	return 0;
-}
-/* 	----------------------------------------------------------------------
-	CenterSlicer
-*/
-i16 CenterSlicer(t_pmr_sps *mySps)
-{
-	i16 npoints/*, lhit, uhit*/;
- 	i16 *input, *output, *buff;
-
-	i32 inputGainB;
-	i32	i;
-	i32 accum;
-
-	i32  amax;			// buffer amplitude maximum
-	i32  amin;			// buffer amplitude minimum
-	i32  apeak;			// buffer amplitude peak
-	i32  center;
-	i32  setpt;			// amplitude set point for peak tracking
-
-	i32  discounteru;	// amplitude detector integrator discharge counter upper
-	i32  discounterl;	// amplitude detector integrator discharge counter lower
-	i32  discfactor;	// amplitude detector integrator discharge factor
-
-	TRACEJ(5,("CenterSlicer() %i\n",mySps->enabled));
-	if(!mySps->enabled)return(1);
-
-	input   = mySps->source;
-	output	= mySps->sink;	 			// limited output
-	buff    = mySps->buff;
-
-	npoints=mySps->nSamples;
-
-	inputGainB=mySps->inputGainB;
-
-	amax=mySps->amax;
-	amin=mySps->amin;
-	setpt=mySps->setpt;
-	apeak=mySps->apeak;
-	discounteru=mySps->discounteru;
-	discounterl=mySps->discounterl;
-
-	discfactor=mySps->discfactor;
-	npoints=mySps->nSamples;
-
-	for(i=0;i<npoints;i++)
-	{
-		#if XPMR_DEBUG0 == 1
-		static i32 tfx=0;
-		#endif
-		accum=input[i];
-
-		/* lhit=uhit=0; */
-
-		if(accum>amax)
-		{
-			amax=accum;
-			/* uhit=1; */
-			if(amin<(amax-setpt))
-			{
-				amin=(amax-setpt);
-				/* lhit=1; */
-			}
-		}
-		else if(accum<amin)
-		{
-			amin=accum;
-			/* lhit=1; */
-			if(amax>(amin+setpt))
-			{
-				amax=(amin+setpt);
-				/* uhit=1; */
-			}
-		}
-		#if 0
-		if((discounteru-=1)<=0 && amax>amin)
-		{
-			if((amax-=10)<amin)amax=amin;
-			uhit=1;
-		}
-
-		if((discounterl-=1)<=0 && amin<amax)
-		{
-			if((amin+=10)>amax)amin=amax;
-			lhit=1;
-		}
-		if(uhit)discounteru=discfactor;
-		if(lhit)discounterl=discfactor;
-
-		#else
-		 
-		if((amax-=discfactor)<amin)amax=amin;
-		if((amin+=discfactor)>amax)amin=amax;
-
-		#endif
-
-		apeak = (amax-amin)/2;
-		center = (amax+amin)/2;
-		accum = accum - center;
-
-		output[i]=accum;  			// sink output unlimited/centered.
-
-		// do limiter function
-		if(accum>inputGainB)accum=inputGainB;
-		else if(accum<-inputGainB)accum=-inputGainB;
-		buff[i]=accum;
-
-		#if XPMR_DEBUG0 == 1
-		#if 0
-		mySps->parentChan->pRxLsdCen[i]=center;	  	// trace center ref
-		#else
-		if((tfx++/8)&1)				  				// trace min/max levels
-			mySps->parentChan->pRxLsdCen[i]=amax;
-		else
-			mySps->parentChan->pRxLsdCen[i]=amin;
-		#endif
-	    #if 0
-		if(mySps->parentChan->frameCountRx&0x01) mySps->parentChan->prxDebug1[i]=amax;
-		else mySps->parentChan->prxDebug1[i]=amin;
-		#endif
-		#endif
-	}
-
-	mySps->amax=amax;
-	mySps->amin=amin;
-	mySps->apeak=apeak;
-	mySps->discounteru=discounteru;
-	mySps->discounterl=discounterl;
-
-	return 0;
-}
-/* 	----------------------------------------------------------------------
-	MeasureBlock
-	determine peak amplitude
-*/
-i16 MeasureBlock(t_pmr_sps *mySps)
-{
-	i16 npoints;
- 	i16 *input, *output;
-
-	i32	i;
-	i32 accum;
-
-	i16  amax;			// buffer amplitude maximum
-	i16  amin;			// buffer amplitude minimum
-	i16  apeak=0;			// buffer amplitude peak (peak to peak)/2
-	i16  setpt;			// amplitude set point for amplitude comparator
-
-	i32  discounteru;	// amplitude detector integrator discharge counter upper
-	i32  discounterl;	// amplitude detector integrator discharge counter lower
-	i32  discfactor;	// amplitude detector integrator discharge factor
-
-	TRACEJ(5,("MeasureBlock() %i\n",mySps->enabled));
-
-	if(!mySps->enabled)return 1;
-
-	if(mySps->option==3)
-	{
-		mySps->amax = mySps->amin = mySps->apeak = \
-		mySps->discounteru = mySps->discounterl = \
-		mySps->enabled = 0;
-		return 1;
-	}
-
-	input   = mySps->source;
-	output	= mySps->sink;
-
-	npoints=mySps->nSamples;
-
-	amax=mySps->amax;
-	amin=mySps->amin;
-	setpt=mySps->setpt;
-	discounteru=mySps->discounteru;
-	discounterl=mySps->discounterl;
-
-	discfactor=mySps->discfactor;
-	npoints=mySps->nSamples;
-
-	for(i=0;i<npoints;i++)
-	{
-		accum=input[i];
-
-		if(accum>amax)
-		{
-			amax=accum;
-			discounteru=discfactor;
-		}
-		else if(--discounteru<=0)
-		{
-			discounteru=discfactor;
-			amax=(i32)((amax*32700)/32768);
-		}
-
-		if(accum<amin)
-		{
-			amin=accum;
-			discounterl=discfactor;
-		}
-		else if(--discounterl<=0)
-		{
-			discounterl=discfactor;
-			amin=(i32)((amin*32700)/32768);
-		}
-
-		apeak = (i32)(amax-amin)/2;
-		if(output)output[i]=apeak;
-	}
-
-	mySps->amax=amax;
-	mySps->amin=amin;
-	mySps->apeak=apeak;
-	mySps->discounteru=discounteru;
-	mySps->discounterl=discounterl;
-	if(apeak>=setpt) mySps->compOut=1;
-	else mySps->compOut=0;
-
-	//TRACEX((" -MeasureBlock()=%i\n",mySps->apeak));
-	return 0;
-}
-/*
-	SoftLimiter
-*/
-i16 SoftLimiter(t_pmr_sps *mySps)
-{
-	i16 npoints;
-	//i16 samples, lhit,uhit;
- 	i16 *input, *output;
-
-	i32 /*inputGain, */outputGain;
-	i32	i;
-	i32 accum;
-	i32  tmp;
-
-	i32  amax;			// buffer amplitude maximum
-	i32  amin;			// buffer amplitude minimum
-	//i32  apeak;		// buffer amplitude peak
-	i32  setpt;			// amplitude set point for amplitude comparator
-
-	input   = mySps->source;
-	output	= mySps->sink;
-
-	/* inputGain=mySps->inputGain; */
-	outputGain=mySps->outputGain;
-
-	npoints=mySps->nSamples;
-
-	setpt=mySps->setpt;
-	amax=(setpt*124)/128;
-	amin=-amax;
-
-	TRACEJ(5,("SoftLimiter() %i %i %i) \n",amin, amax,setpt));
-
-	for(i=0;i<npoints;i++)
-	{
-		accum=input[i];
-		//accum=input[i]*mySps->inputGain/256;
-
-		if(accum>setpt)
-		{
-		    tmp=((accum-setpt)*4)/128;
-		    accum=setpt+tmp;
-			if(accum>amax)accum=amax;
-			accum=setpt;
-		}
-		else if(accum<-setpt)
-		{
-		    tmp=((accum+setpt)*4)/128;
-		    accum=(-setpt)-tmp;
-			if(accum<amin)accum=amin;
-			accum=-setpt;
-		}
-
-		output[i]=(accum*outputGain)/M_Q8;
-	}
-
-	return 0;
-}
-/*
-	SigGen() - sine, square function generator
-	sps overloaded values
-	discfactor  = phase factor
-	discfactoru = phase index
-	if source is not NULL then mix it in!
-
-	sign table and output gain are in Q15 format (32767=.999)
-*/
-i16	SigGen(t_pmr_sps *mySps)
-{
-	#define PH_FRACT_FACT	128
-
-	i32 ph;
-	i16 i,outputgain,waveform,numChanOut,selChanOut;
-	i32 accum;
-	
-	t_pmr_chan *pChan;
-	pChan=mySps->parentChan;
-	TRACEC(5,("SigGen(%i %i %i)\n",mySps->option,mySps->enabled,mySps->state));
-
-	if(!mySps->freq ||!mySps->enabled)return 0;
-
-	outputgain=mySps->outputGain;
-	waveform=0;
-	numChanOut=mySps->numChanOut;
-	selChanOut=mySps->selChanOut;
-
-    if(mySps->option==1)
-	{
-		mySps->option=0;
-		mySps->state=1;
-		mySps->discfactor=
-			(SAMPLES_PER_SINE*mySps->freq*PH_FRACT_FACT)/mySps->sampleRate/10;
-
-		TRACEF(5,(" SigGen() discfactor = %i\n",mySps->discfactor));
-		if(mySps->discounterl)mySps->state=2;
-	}
-	else if(mySps->option==2)
-	{
-		i16 shiftfactor=CTCSS_TURN_OFF_SHIFT;
-		// phase shift request
-		mySps->option=0;
-		mySps->state=2;
-		mySps->discounterl=CTCSS_TURN_OFF_TIME-(2*MS_PER_FRAME);   		//
-
-		mySps->discounteru = \
-			(mySps->discounteru + (((SAMPLES_PER_SINE*shiftfactor)/360)*PH_FRACT_FACT)) % (SAMPLES_PER_SINE*PH_FRACT_FACT);
-		//printf("shiftfactor = %i\n",shiftfactor);
-		//shiftfactor+=10;
-	}
-	else if(mySps->option==3)
-	{
-		// stop it and clear the output buffer
-		mySps->option=0;
-		mySps->state=0;
-		mySps->enabled=0;
-		for(i=0;i<mySps->nSamples;i++)
-			mySps->sink[(i*numChanOut)+selChanOut]=0;
-		return(0);
-	}
-	else if(mySps->state==2)
-	{
-		// doing turn off
-		mySps->discounterl-=MS_PER_FRAME;
-		if(mySps->discounterl<=0)
-		{
-			mySps->option=3;
-			mySps->state=2;
-		}
-	}
-	else if(mySps->state==0)
-	{
-		return(0);
-	}
-
-	ph=mySps->discounteru;
-
-	for(i=0;i<mySps->nSamples;i++)
-	{
-		if(!waveform)
-		{
-			// sine
-			//tmp=(sinetablex[ph/PH_FRACT_FACT]*amplitude)/M_Q16;
-			accum=sinetablex[ph/PH_FRACT_FACT];
-			accum=(accum*outputgain)/M_Q8;
-	    }
-		else
-		{
-			// square
-			if(ph>SAMPLES_PER_SINE/2)
-				accum=outputgain/M_Q8;
-			else
-				accum=-outputgain/M_Q8;
-		}
-
-		if(mySps->source)accum+=mySps->source[i];
-
-		mySps->sink[(i*numChanOut)+selChanOut]=accum;
-
-		ph=(ph+mySps->discfactor)%(SAMPLES_PER_SINE*PH_FRACT_FACT);
-	}
-
-	mySps->discounteru=ph;
-
-	return 0;
-}
-/*
-	adder/mixer
-	takes existing buffer and adds source buffer to destination buffer
-	sink buffer = (sink buffer * gain) + source buffer
-*/
-i16 pmrMixer(t_pmr_sps *mySps)
-{
-	i32 accum;
-	i16 i, *input, *inputB, *output;
-	i16  inputGain, inputGainB;	  	// apply to input data	 in Q7.8 format
-	i16  outputGain;	// apply to output data  in Q7.8 format
-	i16	 discounteru,discounterl,amax,amin,setpt,discfactor;
-	i16	 npoints,uhit,lhit,apeak,measPeak;
-
-	t_pmr_chan *pChan;
-	pChan=mySps->parentChan;
-	TRACEF(5,("pmrMixer()\n"));
-
-	input     = mySps->source;
-	inputB    = mySps->sourceB;
-	output    = mySps->sink;
-
-	inputGain=mySps->inputGain;
-	inputGainB=mySps->inputGainB;
-	outputGain=mySps->outputGain;
-
-	amax=mySps->amax;
-	amin=mySps->amin;
-	setpt=mySps->setpt;
-	discounteru=mySps->discounteru;
-	discounterl=mySps->discounteru;
-
-	discfactor=mySps->discfactor;
-	npoints=mySps->nSamples;
-	measPeak=mySps->measPeak;
-
-	for(i=0;i<npoints;i++)
-	{
-		accum = ((input[i]*inputGain)/M_Q8) +
-				((inputB[i]*inputGainB)/M_Q8);
-
-		accum=(accum*outputGain)/M_Q8;
-		output[i]=accum;
-
-		if(measPeak){
-	  		lhit=uhit=0;
-
-			if(accum>amax){
-				amax=accum;
-				uhit=1;
-				if(amin<(amax-setpt)){
-					amin=(amax-setpt);
-					lhit=1;
-				}
-			}
-			else if(accum<amin){
-				amin=accum;
-				lhit=1;
-				if(amax>(amin+setpt)){
-					amax=(amin+setpt);
-					uhit=1;
-				}
-			}
-
-			if(--discounteru<=0 && amax>0){
-				amax--;
-				uhit=1;
-			}
-
-			if(--discounterl<=0 && amin<0){
-				amin++;
-				lhit=1;
-			}
-
-			if(uhit)discounteru=discfactor;
-			if(lhit)discounterl=discfactor;
-		}
- 	}
-
-	if(measPeak){
-		apeak = (amax-amin)/2;
-		mySps->apeak=apeak;
-		mySps->amax=amax;
-		mySps->amin=amin;
-		mySps->discounteru=discounteru;
-		mySps->discounterl=discounterl;
-	}
-
-	return 0;
-}
-/*
-	DelayLine
-*/
-i16 DelayLine(t_pmr_sps *mySps)
-{
-	i16 *input, *output, *buff;
-	i16	 i, npoints,buffsize,inindex,outindex;
-
-	t_pmr_chan *pChan;
-	pChan=mySps->parentChan;
-	TRACEF(5,(" DelayLine() %i\n",mySps->enabled));
-
-	input    	= mySps->source;
-	output    	= mySps->sink;
-	buff     	= (i16*)(mySps->buff);
-	buffsize  	= mySps->buffSize;
-	npoints		= mySps->nSamples;
-
-	outindex	= mySps->buffOutIndex;
-	inindex		= outindex + mySps->buffLead;
-
-	for(i=0;i<npoints;i++)
-	{
-		inindex %= buffsize;
-		outindex %= buffsize;
-
-		buff[inindex]=input[i];
-		output[i]=buff[outindex];
-		inindex++;
-		outindex++;
- 	}
-	mySps->buffOutIndex=outindex;
-
- 	return 0;
-}
-/*
-	Continuous Tone Coded Squelch (CTCSS) Detector
-*/
-i16 ctcss_detect(t_pmr_chan *pChan)
-{
-	i16 i,points2do,*pInput,hit,thit,relax;
-	i16 tnum, tmp,indexNow,diffpeak;
-	/* i16 difftrig; */
-	i16 tv0,tv1,tv2,tv3,indexDebug;
-	i16 points=0;
-	i16 indexWas=0;
-
-	TRACEF(5,("ctcss_detect(%p) %i %i %i %i\n",pChan,
-		pChan->rxCtcss->enabled,
-		0,
-		pChan->rxCtcss->testIndex,
-		pChan->rxCtcss->decode));
-
-	if(!pChan->rxCtcss->enabled)return(1);
-
-	relax  = pChan->rxCtcss->relax;
-	pInput = pChan->rxCtcss->input;
-
-	/*
-	if(relax) difftrig=(-0.1*M_Q15);
-	else difftrig=(-0.05*M_Q15);
-	*/
-
-	thit=hit=-1;
-
-	//TRACEX((" ctcss_detect() %i  %i  %i  %i\n", CTCSS_NUM_CODES,0,0,0));
-
-	for(tnum=0;tnum<CTCSS_NUM_CODES;tnum++)
-	{
-		i32 accum, peak;
-		t_tdet	*ptdet;
-		i16 fudgeFactor;
-		i16 binFactor;
-
-		TRACEF(6,(" ctcss_detect() tnum=%i %i\n",tnum,pChan->rxCtcssMap[tnum]));
-		//if(tnum==14)printf("ctcss_detect() %i %i %i\n",tnum,pChan->rxCtcssMap[tnum], pChan->rxCtcss->decode );
-
-		if( (pChan->rxCtcssMap[tnum]==CTCSS_NULL) ||
-		    (pChan->rxCtcss->decode>CTCSS_NULL && (tnum!= pChan->rxCtcss->decode))
-		  )
-			continue;
-
-		TRACEF(6,(" ctcss_detect() tnum=%i\n",tnum));
-
-		ptdet=&(pChan->rxCtcss->tdet[tnum]);
-		indexDebug=0;
-		points=points2do=pChan->nSamplesRx;
-		fudgeFactor=ptdet->fudgeFactor;
-		binFactor=ptdet->binFactor;
-
-		while(ptdet->counter < (points2do*CTCSS_SCOUNT_MUL))
-		{
-			tmp=(ptdet->counter/CTCSS_SCOUNT_MUL)+1;
-		    ptdet->counter-=(tmp*CTCSS_SCOUNT_MUL);
-			points2do-=tmp;
-			indexNow=points-points2do;
-
-			ptdet->counter += ptdet->counterFactor;
-
-			accum = pInput[indexNow-1];	 	// duuuude's major bug fix!
-
-			ptdet->z[ptdet->zIndex]+=
-				(((accum - ptdet->z[ptdet->zIndex])*binFactor)/M_Q15);
-
-			peak = abs(ptdet->z[0]-ptdet->z[2]) + abs(ptdet->z[1]-ptdet->z[3]);
-
-			if (ptdet->peak < peak)
-				ptdet->peak += ( ((peak-ptdet->peak)*binFactor)/M_Q15);
-			else
-				ptdet->peak=peak;
-
-			{
-				static const i16 a0=13723;
-				static const i16 a1=-13723;
-				i32 temp0,temp1;
-				i16 x0;
-
-				//differentiate
-				x0=ptdet->zd;
-				temp0 =	x0 * a1;
-				ptdet->zd = ptdet->peak;
-				temp1 = ptdet->peak * a0;
-			    diffpeak = (temp0 + temp1)/1024;
-			}
-
-			if(diffpeak<(-0.03*M_Q15))ptdet->dvd-=4;
-			else if(ptdet->dvd<0)ptdet->dvd++;
-
-			if((ptdet->dvd < -12) && diffpeak > (-0.02*M_Q15))ptdet->dvu+=2;
-			else if(ptdet->dvu)ptdet->dvu--;
-
-			tmp=ptdet->setpt;
-			if(pChan->rxCtcss->decode==tnum)
-			{
-				if(relax)tmp=(tmp*55)/100;
-				else tmp=(tmp*80)/100;
-			}
-
-			if(ptdet->peak > tmp)
-			{
-			    if(ptdet->decode<(fudgeFactor*32))ptdet->decode++;
-			}
-			else if(pChan->rxCtcss->decode==tnum)
-			{
-				if(ptdet->peak > ptdet->hyst)ptdet->decode--;
-				else if(relax) ptdet->decode--;
-				else ptdet->decode-=4;
-			}
-			else
-			{
-				ptdet->decode=0;
-			}
-
-			if((pChan->rxCtcss->decode==tnum) && !relax && (ptdet->dvu > (0.00075*M_Q15)))
-			{
-				ptdet->decode=0;
-				ptdet->z[0]=ptdet->z[1]=ptdet->z[2]=ptdet->z[3]=ptdet->dvu=0;
-				TRACEF(4,("ctcss_detect() turnoff detected by dvdt for tnum = %i.\n",tnum));
-			}
-
-			if(ptdet->decode<0 || !pChan->rxCarrierDetect)ptdet->decode=0;
-
-			if(ptdet->decode>=fudgeFactor)
-			{
-				thit=tnum;
-				if(pChan->rxCtcss->decode!=tnum)
-				{
-					ptdet->zd=ptdet->dvu=ptdet->dvd=0;	
-				}
-			}
-
-			#if XPMR_DEBUG0 == 1
-			if(thit>=0 && thit==tnum)
-				TRACEF(6,(" ctcss_detect() %i %i %i %i \n",tnum,ptdet->peak,ptdet->setpt,ptdet->hyst));
-
-			if(ptdet->pDebug0)
-			{
-				tv0=ptdet->peak;
-				tv1=ptdet->decode;
-				tv2=tmp;
-				tv3=ptdet->dvu*32;
-
-				if(indexDebug==0)
-				{
-					ptdet->lasttv0=ptdet->pDebug0[points-1];
-					ptdet->lasttv1=ptdet->pDebug1[points-1];
-					ptdet->lasttv2=ptdet->pDebug2[points-1];
-					ptdet->lasttv3=ptdet->pDebug3[points-1];
-				}
-
-				while(indexDebug<indexNow)
-				{
-					ptdet->pDebug0[indexDebug]=ptdet->lasttv0;
-					ptdet->pDebug1[indexDebug]=ptdet->lasttv1;
-					ptdet->pDebug2[indexDebug]=ptdet->lasttv2;
-					ptdet->pDebug3[indexDebug]=ptdet->lasttv3;
-					indexDebug++;
-				}
-				ptdet->lasttv0=tv0;
-				ptdet->lasttv1=tv1;
-				ptdet->lasttv2=tv2;
-				ptdet->lasttv3=tv3;
-			}
-			#endif
-			indexWas=indexNow;
-			ptdet->zIndex=(ptdet->zIndex + 1) % 4;
-		}
-		ptdet->counter-=(points2do*CTCSS_SCOUNT_MUL);
-
-		#if XPMR_DEBUG0 == 1
-		for(i=indexWas;i<points;i++)
-		{
-			ptdet->pDebug0[i]=ptdet->lasttv0;
-			ptdet->pDebug1[i]=ptdet->lasttv1;
-			ptdet->pDebug2[i]=ptdet->lasttv2;
-			ptdet->pDebug3[i]=ptdet->lasttv3;
-		}
-		#endif
-	}
-
-	//TRACEX((" ctcss_detect() thit %i\n",thit));
-
-	if(pChan->rxCtcss->BlankingTimer>0)pChan->rxCtcss->BlankingTimer-=points;
-	if(pChan->rxCtcss->BlankingTimer<0)pChan->rxCtcss->BlankingTimer=0;
-
-    if(thit>CTCSS_NULL && pChan->rxCtcss->decode<=CTCSS_NULL && !pChan->rxCtcss->BlankingTimer)
-    {
-		pChan->rxCtcss->decode=thit;
-		sprintf(pChan->rxctcssfreq,"%.1f",freq_ctcss[thit]);
-		TRACEC(1,("ctcss decode  %i  %.1f\n",thit,freq_ctcss[thit]));
-	}
-	else if(thit<=CTCSS_NULL && pChan->rxCtcss->decode>CTCSS_NULL)
-	{
-		pChan->rxCtcss->BlankingTimer=SAMPLE_RATE_NETWORK/5;
-		pChan->rxCtcss->decode=CTCSS_NULL;
-		strcpy(pChan->rxctcssfreq,"0");
-		TRACEC(1,("ctcss decode  NULL\n"));
-		for(tnum=0;tnum<CTCSS_NUM_CODES;tnum++)
-		{
-		    t_tdet	*ptdet=NULL;
-			ptdet=&(pChan->rxCtcss->tdet[tnum]);
-		    ptdet->decode=0;
-			ptdet->z[0]=ptdet->z[1]=ptdet->z[2]=ptdet->z[3]=0;
-		}
-	}
-	//TRACEX((" ctcss_detect() thit %i %i\n",thit,pChan->rxCtcss->decode));
-	return(0);
-}
-/*
-	TxTestTone
-*/
-static i16	TxTestTone(t_pmr_chan *pChan, i16 function)
-{
-	if(function==1)
-	{
-		pChan->spsSigGen1->enabled=1;
-		pChan->spsSigGen1->option=1;
-		pChan->spsSigGen1->outputGain=(.23125*M_Q8);   // to match *99 level
-		pChan->spsTx->source=pChan->spsSigGen1->sink;
-	}
-	else
-	{
-		pChan->spsSigGen1->option=3;
-	}
-	return 0;
-}
-/*
-	assumes:
-	sampling rate is 48KS/s
-	samples are all 16 bits
-    samples are filtered and decimated by 1/6th
-*/
-t_pmr_chan	*createPmrChannel(t_pmr_chan *tChan, i16 numSamples)
-{
-	i16 i, *inputTmp;
-	t_pmr_chan 	*pChan;
-	t_pmr_sps  	*pSps;
-	t_dec_ctcss	*pDecCtcss;
-
-	TRACEJ(1,("createPmrChannel(%p,%i)\n",tChan,numSamples));
-
-	pChan = (t_pmr_chan *)calloc(sizeof(t_pmr_chan),1);
-	if(pChan==NULL)
-	{
-		printf("createPmrChannel() failed\n");
-		return(NULL);
-	}
-
-	#if XPMR_PPTP == 1
-	pptp_init();
-	#endif
-
-	pChan->index=pmrChanIndex++;
-	pChan->nSamplesTx=pChan->nSamplesRx=numSamples;
-
-	pDecCtcss = (t_dec_ctcss *)calloc(sizeof(t_dec_ctcss),1);
-	pChan->rxCtcss=pDecCtcss;
-	pChan->rxctcssfreq[0]=0;
-
-	#ifdef HAVE_XPMRX
-	if(tChan->rptnum>=LSD_CHAN_MAX)tChan->rptnum=0;
-	#endif
-
-	if(tChan==NULL)
-	{
-		printf("createPmrChannel() WARNING: NULL tChan!\n");
-		pChan->rxNoiseSquelchEnable=0;
-		pChan->rxHpfEnable=0;
-		pChan->rxDeEmpEnable=0;
-		pChan->rxCenterSlicerEnable=0;
-		pChan->rxCtcssDecodeEnable=0;
-		pChan->rxDcsDecodeEnable=0;
-
-		pChan->rxCarrierPoint = 17000;
-		pChan->rxCarrierHyst = 2500;
-
-		pChan->txHpfEnable=0;
-		pChan->txLimiterEnable=0;
-		pChan->txPreEmpEnable=0;
-		pChan->txLpfEnable=1;
-		pChan->txMixA=TX_OUT_VOICE;
-		pChan->txMixB=TX_OUT_LSD;
-	}
-	else
-	{
-		pChan->rxDemod=tChan->rxDemod;
-		pChan->rxCdType=tChan->rxCdType;
-		pChan->rxSquelchPoint = tChan->rxSquelchPoint;
-		pChan->rxCarrierHyst = 3000;
-		pChan->rxSqVoxAdj=tChan->rxSqVoxAdj;
-
-		pChan->txMod=tChan->txMod;
-		pChan->txHpfEnable=1;
-		pChan->txLpfEnable=1;
-
-		pChan->pTxCodeDefault=tChan->pTxCodeDefault;
-		pChan->pRxCodeSrc=tChan->pRxCodeSrc;
-		pChan->pTxCodeSrc=tChan->pTxCodeSrc;
-
-		pChan->txMixA=tChan->txMixA;
-		pChan->txMixB=tChan->txMixB;
-		pChan->radioDuplex=tChan->radioDuplex;
-		pChan->area=tChan->area;
-		pChan->rptnum=tChan->rptnum;
-		pChan->idleinterval=tChan->idleinterval;
-		pChan->turnoffs=tChan->turnoffs;
-		pChan->b.rxpolarity=tChan->b.rxpolarity;
-		pChan->b.txpolarity=tChan->b.txpolarity;
-		pChan->b.dcsrxpolarity=tChan->b.dcsrxpolarity;
-		pChan->b.dcstxpolarity=tChan->b.dcstxpolarity;
-		pChan->b.lsdrxpolarity=tChan->b.lsdrxpolarity;
-		pChan->b.lsdtxpolarity=tChan->b.lsdtxpolarity;
-
-		pChan->txsettletime=tChan->txsettletime;
-		pChan->tracelevel=tChan->tracelevel;
-		pChan->tracetype=tChan->tracetype;
-		pChan->ukey=tChan->ukey;
-		pChan->name=tChan->name;
-	}
-
-
-	pChan->txHpfEnable=1;
-	pChan->txLpfEnable=1;
-
-	if(pChan->rxCdType==CD_XPMR_NOISE) pChan->rxNoiseSquelchEnable=1;
-
-	if(pChan->rxDemod==RX_AUDIO_FLAT) pChan->rxDeEmpEnable=1;
-
-	pChan->rxCarrierPoint=(pChan->rxSquelchPoint*32767)/100;
-	pChan->rxCarrierHyst = 3000; //pChan->rxCarrierPoint/15;
-
-	pChan->rxDcsDecodeEnable=0;
-
-	if(pChan->b.ctcssRxEnable || pChan->b.dcsRxEnable || pChan->b.lmrRxEnable)
-	{
-		pChan->rxHpfEnable=1;
-		pChan->rxCenterSlicerEnable=1;
-		pChan->rxCtcssDecodeEnable=1;
-	}
-
-	if(pChan->txMod){
-		pChan->txPreEmpEnable=1;
-		pChan->txLimiterEnable=1;
-	}
-
-	pChan->dd.option=9;
-	dedrift(pChan);
-
-	TRACEF(1,("calloc buffers \n"));
-
-	pChan->pRxDemod 	= calloc(numSamples,2);
-	pChan->pRxNoise 	= calloc(numSamples,2);
-	pChan->pRxBase 		= calloc(numSamples,2);
-	pChan->pRxHpf 		= calloc(numSamples,2);
-	pChan->pRxLsd 		= calloc(numSamples,2);
-	pChan->pRxSpeaker 	= calloc(numSamples,2);
-	pChan->pRxCtcss 	= calloc(numSamples,2);
-	pChan->pRxDcTrack 	= calloc(numSamples,2);
-	pChan->pRxLsdLimit 	= calloc(numSamples,2);
-
-	pChan->pTxInput  	= calloc(numSamples,2);
-	pChan->pTxBase  	= calloc(numSamples,2);
-	pChan->pTxHpf	 	= calloc(numSamples,2);
-	pChan->pTxPreEmp 	= calloc(numSamples,2);
-	pChan->pTxLimiter 	= calloc(numSamples,2);
-	pChan->pTxLsd	 	= calloc(numSamples,2);
-	pChan->pTxLsdLpf    = calloc(numSamples,2);
-	pChan->pTxComposite	= calloc(numSamples,2);
-	pChan->pSigGen0		= calloc(numSamples,2);
-    pChan->pSigGen1		= calloc(numSamples,2);
-		
-	pChan->prxMeasure	= calloc(numSamples,2);
-
-	pChan->pTxOut		= calloc(numSamples,2*2*6);		// output buffer
-    
-#ifdef HAVE_XPMRX
-	pChan->pLsdEnc		= calloc(sizeof(t_encLsd),1);
-#endif
-
-	#if XPMR_DEBUG0 == 1
-	TRACEF(1,("configure tracing\n"));
-
-	pChan->pTstTxOut	= calloc(numSamples,2);
-	pChan->pRxLsdCen    = calloc(numSamples,2);
-	pChan->prxDebug0	= calloc(numSamples,2);
-	pChan->prxDebug1	= calloc(numSamples,2);
-	pChan->prxDebug2	= calloc(numSamples,2);
-	pChan->prxDebug3	= calloc(numSamples,2);
-	pChan->ptxDebug0	= calloc(numSamples,2);
-	pChan->ptxDebug1	= calloc(numSamples,2);
-	pChan->ptxDebug2	= calloc(numSamples,2);
-	pChan->ptxDebug3	= calloc(numSamples,2);
-	pChan->pNull		= calloc(numSamples,2);
-
-	for(i=0;i<numSamples;i++)pChan->pNull[i]=((i%(numSamples/2))*8000)-4000;
-
-	pChan->rxCtcss->pDebug0=calloc(numSamples,2);
-	pChan->rxCtcss->pDebug1=calloc(numSamples,2);
-	pChan->rxCtcss->pDebug2=calloc(numSamples,2);
-	pChan->rxCtcss->pDebug3=calloc(numSamples,2);
-
-	for(i=0;i<CTCSS_NUM_CODES;i++)
-	{
-		pChan->rxCtcss->tdet[i].pDebug0=calloc(numSamples,2);
-		pChan->rxCtcss->tdet[i].pDebug1=calloc(numSamples,2);
-		pChan->rxCtcss->tdet[i].pDebug2=calloc(numSamples,2);
-		pChan->rxCtcss->tdet[i].pDebug3=calloc(numSamples,2);
-	}
-
-	// buffer, 2 bytes per sample, and 16 channels
-	pChan->prxDebug=calloc(numSamples*16,2);
-	pChan->ptxDebug=calloc(numSamples*16,2);
-
-	// TSCOPE CONFIGURATION SETSCOPE configure debug traces and sources for each channel of the output
-	pChan->sdbg			= (t_sdbg *)calloc(sizeof(t_sdbg),1);
-
-	for(i=0;i<XPMR_DEBUG_CHANS;i++)pChan->sdbg->trace[i]=-1; 	
-
-	TRACEF(1,("pChan->tracetype = %i\n",pChan->tracetype));
-
-	if(pChan->tracetype==1)				  			// CTCSS DECODE
-	{
-		pChan->sdbg->source [0]=pChan->pRxDemod;
-		pChan->sdbg->source [1]=pChan->pRxBase;
-		pChan->sdbg->source [2]=pChan->pRxNoise;
-		pChan->sdbg->trace  [3]=RX_NOISE_TRIG;
-		pChan->sdbg->source [4]=pChan->pRxLsd;
-		pChan->sdbg->source [5]=pChan->pRxLsdCen;
-		pChan->sdbg->source [6]=pChan->pRxLsdLimit;
-		pChan->sdbg->source [7]=pChan->rxCtcss->tdet[3].pDebug0;
-		pChan->sdbg->trace  [8]=RX_CTCSS_DECODE;
-		pChan->sdbg->trace  [9]=RX_SMODE;
-	}
-	if(pChan->tracetype==2)							// CTCSS DECODE
-	{
-		pChan->sdbg->source [0]=pChan->pRxDemod;
-		pChan->sdbg->source [1]=pChan->pRxBase;
-		pChan->sdbg->trace  [2]=RX_NOISE_TRIG;
-		pChan->sdbg->source [3]=pChan->pRxLsd;
-		pChan->sdbg->source [4]=pChan->pRxLsdCen;
-		pChan->sdbg->source [5]=pChan->pRxDcTrack;
-		pChan->sdbg->source [6]=pChan->pRxLsdLimit;
-		pChan->sdbg->source [7]=pChan->rxCtcss->tdet[3].pDebug0;
-		pChan->sdbg->source [8]=pChan->rxCtcss->tdet[3].pDebug1;
-		pChan->sdbg->source [9]=pChan->rxCtcss->tdet[3].pDebug2;
-		pChan->sdbg->source [10]=pChan->rxCtcss->tdet[3].pDebug3;
-		pChan->sdbg->trace  [11]=RX_CTCSS_DECODE;
-		pChan->sdbg->trace  [12]=RX_SMODE;
-		pChan->sdbg->trace  [13]=TX_PTT_IN;
-		pChan->sdbg->trace  [14]=TX_PTT_OUT;
-		pChan->sdbg->source [15]=pChan->pTxLsdLpf;
-	}
-	else if(pChan->tracetype==3)					// DCS DECODE
-	{
-		pChan->sdbg->source [0]=pChan->pRxDemod;
-		pChan->sdbg->source [1]=pChan->pRxBase;
-		pChan->sdbg->trace  [2]=RX_NOISE_TRIG;
-		pChan->sdbg->source [3]=pChan->pRxLsd;
-		pChan->sdbg->source [4]=pChan->pRxLsdCen;
-		pChan->sdbg->source [5]=pChan->pRxDcTrack;
-		pChan->sdbg->trace  [6]=RX_DCS_CLK;
-		pChan->sdbg->trace  [7]=RX_DCS_DIN;
-		pChan->sdbg->trace  [8]=RX_DCS_DEC;
-		pChan->sdbg->trace  [9]=RX_SMODE;
-		pChan->sdbg->trace  [10]=TX_PTT_IN;
-		pChan->sdbg->trace  [11]=TX_PTT_OUT;
-		pChan->sdbg->trace  [12]=TX_LSD_CLK;
-		pChan->sdbg->trace  [13]=TX_LSD_DAT;
-		pChan->sdbg->trace  [14]=TX_LSD_GEN;
-		pChan->sdbg->source [14]=pChan->pTxLsd;
-		pChan->sdbg->source [15]=pChan->pTxLsdLpf;
-	}
-	else if(pChan->tracetype==4)			 		// LSD DECODE
-	{
-		pChan->sdbg->source [0]=pChan->pRxDemod;
-		pChan->sdbg->source [1]=pChan->pRxBase;
-		pChan->sdbg->trace  [2]=RX_NOISE_TRIG;
-		pChan->sdbg->source [3]=pChan->pRxLsd;
-		pChan->sdbg->source [4]=pChan->pRxLsdCen;
-		pChan->sdbg->source [5]=pChan->pRxDcTrack;
-		pChan->sdbg->trace  [6]=RX_LSD_CLK;
-		pChan->sdbg->trace  [7]=RX_LSD_DAT;
-		pChan->sdbg->trace  [8]=RX_LSD_ERR;
-		pChan->sdbg->trace  [9]=RX_LSD_SYNC;
-		pChan->sdbg->trace  [10]=RX_SMODE;
-		pChan->sdbg->trace  [11]=TX_PTT_IN;
-		pChan->sdbg->trace  [12]=TX_PTT_OUT;
-		pChan->sdbg->trace  [13]=TX_LSD_CLK;
-		pChan->sdbg->trace  [14]=TX_LSD_DAT;
-		//pChan->sdbg->trace  [14]=TX_LSD_GEN;
-		//pChan->sdbg->source [14]=pChan->pTxLsd;
-		pChan->sdbg->source [15]=pChan->pTxLsdLpf;
-	}
-	else if(pChan->tracetype==5)						// LSD LOGIC
-	{
-		pChan->sdbg->source [0]=pChan->pRxBase;
-		pChan->sdbg->trace  [1]=RX_NOISE_TRIG;
-		pChan->sdbg->source [2]=pChan->pRxDcTrack;
-		pChan->sdbg->trace  [3]=RX_LSD_SYNC;
-		pChan->sdbg->trace  [4]=RX_SMODE;
-		pChan->sdbg->trace  [5]=TX_PTT_IN;
-		pChan->sdbg->trace  [6]=TX_PTT_OUT;
-		pChan->sdbg->source [7]=pChan->pTxLsdLpf;
-	}
-	else if(pChan->tracetype==6)
-	{
-		// tx clock skew and jitter buffer
-		pChan->sdbg->source [0]=pChan->pRxDemod;
-		pChan->sdbg->source  [5]=pChan->pTxBase;
-		pChan->sdbg->trace   [6]=TX_DEDRIFT_LEAD;
-		pChan->sdbg->trace   [7]=TX_DEDRIFT_ERR;
-		pChan->sdbg->trace   [8]=TX_DEDRIFT_FACTOR;
-		pChan->sdbg->trace   [9]=TX_DEDRIFT_DRIFT;
-	}
-	else if(pChan->tracetype==7)
-	{
-		// tx path
-		pChan->sdbg->source [0]=pChan->pRxBase;
-		pChan->sdbg->trace  [1]=RX_NOISE_TRIG;
-		pChan->sdbg->source [2]=pChan->pRxLsd;
-		pChan->sdbg->trace  [3]=RX_CTCSS_DECODE;
-		pChan->sdbg->source [4]=pChan->pRxHpf;
-
-		pChan->sdbg->trace  [5]=TX_PTT_IN;
-		pChan->sdbg->trace  [6]=TX_PTT_OUT;
-
-		pChan->sdbg->source [7]=pChan->pTxBase;
-		pChan->sdbg->source [8]=pChan->pTxHpf;
-		pChan->sdbg->source [9]=pChan->pTxPreEmp;
-		pChan->sdbg->source [10]=pChan->pTxLimiter;
-		pChan->sdbg->source [11]=pChan->pTxComposite;
-		pChan->sdbg->source [12]=pChan->pTxLsdLpf;
-	}
-
-	for(i=0;i<XPMR_DEBUG_CHANS;i++){
-		if(pChan->sdbg->trace[i]>=0)pChan->sdbg->point[pChan->sdbg->trace[i]]=i; 	
-	}
-	pChan->sdbg->mode=1;
- 	#endif
-
-	#ifdef XPMRX_H
-	// LSD GENERATOR
- 	pSps=pChan->spsLsdGen=createPmrSps(pChan);
-	pSps->source=NULL;
-	pSps->sink=pChan->pTxLsd;
-	pSps->numChanOut=1;
-	pSps->selChanOut=0;
-	pSps->sigProc=LsdGen;
-	pSps->nSamples=pChan->nSamplesTx;
-	pSps->outputGain=(.25*M_Q8);
-	pSps->option=0;
-	pSps->interpolate=1;
-	pSps->decimate=1;
-	pSps->enabled=0;
-	#endif
-
-	// General Purpose Function Generator
-	pSps=pChan->spsSigGen1=createPmrSps(pChan);
-	pSps->sink=pChan->pSigGen1;
-	pSps->numChanOut=1;
-	pSps->selChanOut=0;
-	pSps->sigProc=SigGen;
-	pSps->nSamples=pChan->nSamplesTx;
-	pSps->sampleRate=SAMPLE_RATE_NETWORK;
-	pSps->freq=10000; 						// in increments of 0.1 Hz
-	pSps->outputGain=(.25*M_Q8);
-	pSps->option=0;
-	pSps->interpolate=1;
-	pSps->decimate=1;
-	pSps->enabled=0;
-
-
-	// CTCSS ENCODER
-	pSps = pChan->spsSigGen0 = createPmrSps(pChan);
-	pSps->sink=pChan->pTxLsd;
-	pSps->sigProc=SigGen;
-	pSps->numChanOut=1;
-	pSps->selChanOut=0;
-	pSps->nSamples=pChan->nSamplesTx;
-	pSps->sampleRate=SAMPLE_RATE_NETWORK;
-	pSps->freq=1000;	  					// in 0.1 Hz steps
-	pSps->outputGain=(0.5*M_Q8);
-	pSps->option=0;
-	pSps->interpolate=1;
-	pSps->decimate=1;
-	pSps->enabled=0;
-
-	// Tx LSD Low Pass Filter
-	pSps=pChan->spsTxLsdLpf=createPmrSps(pChan);
-	pSps->source=pChan->pTxLsd;
-	pSps->sink=pChan->pTxLsdLpf;
-	pSps->sigProc=pmr_gp_fir;
-	pSps->enabled=0;
-	pSps->numChanOut=1;
-	pSps->selChanOut=0;
-	pSps->nSamples=pChan->nSamplesTx;
-	pSps->decimator=pSps->decimate=1;
-	pSps->interpolate=1;
-	pSps->inputGain=(1*M_Q8);
-	pSps->outputGain=(1*M_Q8);
-	 
-	// configure the longer, lower cutoff filter by default
-	pSps->ncoef=taps_fir_lpf_215_9_88;
-	pSps->size_coef=2;
-	pSps->coef=(void*)coef_fir_lpf_215_9_88;
-	pSps->nx=taps_fir_lpf_215_9_88;
-	pSps->size_x=2;
-	pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-	pSps->calcAdjust=gain_fir_lpf_215_9_88;
-
-	pSps->inputGain=(1*M_Q8);
-	pSps->outputGain=(1*M_Q8);
-
-	TRACEF(1,("spsTxLsdLpf = sps \n"));
-
-	if(pSps==NULL)printf("Error: calloc(), createPmrChannel()\n");
-
-
-	// RX Process
-	TRACEF(1,("create rx\n"));
-	pSps = NULL;
-
-	// allocate space for first sps and set pointers
-	pSps=pChan->spsRx=createPmrSps(pChan);
-	pSps->source=NULL;					//set when called
-	pSps->sink=pChan->pRxBase;
-	pSps->sigProc=pmr_rx_frontend;
-	pSps->enabled=1;
-	pSps->decimator=pSps->decimate=6;
-	pSps->interpolate=1;
-	pSps->nSamples=pChan->nSamplesRx;
-	pSps->ncoef=taps_fir_bpf_noise_1;
-	pSps->size_coef=2;
-	pSps->coef=(void*)coef_fir_lpf_3K_1;
-	pSps->coef2=(void*)coef_fir_bpf_noise_1;
-	pSps->nx=taps_fir_bpf_noise_1;
-	pSps->size_x=2;
-	pSps->x=(void*)(calloc(pSps->nx,pSps->size_coef));
-	pSps->calcAdjust=(gain_fir_lpf_3K_1*256)/0x0100;
-	pSps->outputGain=(1.0*M_Q8);
-	pSps->discfactor=2;
-	pSps->hyst=pChan->rxCarrierHyst;
-	pSps->setpt=pChan->rxCarrierPoint;
-	pChan->prxSquelchAdjust=&pSps->setpt;
-	#if XPMR_DEBUG0 == 1
-	pSps->debugBuff0=pChan->pRxDemod;
-	pSps->debugBuff1=pChan->pRxNoise;
-	pSps->debugBuff2=pChan->prxDebug0;
-	#endif
-
-
-	// allocate space for next sps and set pointers
-	// Rx SubAudible Decoder Low Pass Filter
-	pSps=pChan->spsRxLsd=pSps->nextSps=createPmrSps(pChan);
-	pSps->source=pChan->pRxBase;
-	pSps->sink=pChan->pRxLsd;
-	pSps->sigProc=pmr_gp_fir;
-	pSps->enabled=1;
-	pSps->numChanOut=1;
-	pSps->selChanOut=0;
-	pSps->nSamples=pChan->nSamplesRx;
-	pSps->decimator=pSps->decimate=1;
-	pSps->interpolate=1;
-
-	// configure the the larger, lower cutoff filter by default
-	pSps->ncoef=taps_fir_lpf_215_9_88;
-	pSps->size_coef=2;
-	pSps->coef=(void*)coef_fir_lpf_215_9_88;
-	pSps->nx=taps_fir_lpf_215_9_88;
-	pSps->size_x=2;
-	pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-	pSps->calcAdjust=gain_fir_lpf_215_9_88;
-
-	pSps->inputGain=(1*M_Q8);
-	pSps->outputGain=(1*M_Q8);
-	pChan->prxCtcssMeasure=pSps->sink;
-	pChan->prxCtcssAdjust=&(pSps->outputGain);
-
-	// CTCSS CenterSlicer
-	pSps=pChan->spsRxLsdNrz=pSps->nextSps=createPmrSps(pChan);
-	pSps->source=pChan->pRxLsd;
-	pSps->sink=pChan->pRxDcTrack;
-	pSps->buff=pChan->pRxLsdLimit;
-	pSps->sigProc=CenterSlicer;
-	pSps->nSamples=pChan->nSamplesRx;
-	pSps->discfactor=LSD_DFS;		  		// centering time constant
-	pSps->inputGain=(1*M_Q8);
-	pSps->outputGain=(1*M_Q8);
-	pSps->setpt=4900;	  			// ptp clamp for DC centering
-	pSps->inputGainB=625; 			// peak output limiter clip point
-	pSps->enabled=0;
-
-
-	// Rx HPF
-	pSps=pSps->nextSps=createPmrSps(pChan);
-	pChan->spsRxHpf=pSps;
-	pSps->source=pChan->pRxBase;
-	pSps->sink=pChan->pRxHpf;
-	pSps->sigProc=pmr_gp_fir;
-	pSps->enabled=1;
-	pSps->numChanOut=1;
-	pSps->selChanOut=0;
-	pSps->nSamples=pChan->nSamplesRx;
-	pSps->decimator=pSps->decimate=1;
-	pSps->interpolate=1;
-	pSps->ncoef=taps_fir_hpf_300_9_66;
-	pSps->size_coef=2;
-	pSps->coef=(void*)coef_fir_hpf_300_9_66;
-	pSps->nx=taps_fir_hpf_300_9_66;
-	pSps->size_x=2;
-	pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-	if(pSps==NULL)printf("Error: calloc(), createPmrChannel()\n");
-	pSps->calcAdjust=gain_fir_hpf_300_9_66;
-	pSps->inputGain=(1*M_Q8);
-	pSps->outputGain=(1*M_Q8);
-	pChan->prxVoiceAdjust=&(pSps->outputGain);
-	pChan->spsRxOut=pSps;
-
-	// allocate space for next sps and set pointers
-	// Rx DeEmp
-	if(pChan->rxDeEmpEnable){
-		pSps=pSps->nextSps=createPmrSps(pChan);
-		pChan->spsRxDeEmp=pSps;
-		pSps->source=pChan->pRxHpf;
-		pSps->sink=pChan->pRxSpeaker;
-		pChan->spsRxOut=pSps;					 // OUTPUT STRUCTURE!
-		pSps->sigProc=gp_inte_00;
-		pSps->enabled=1;
-		pSps->nSamples=pChan->nSamplesRx;
-
-		pSps->ncoef=taps_int_lpf_300_1_2;
-		pSps->size_coef=2;
-		pSps->coef=(void*)coef_int_lpf_300_1_2;
-
-		pSps->nx=taps_int_lpf_300_1_2;
-		pSps->size_x=4;
-		pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-		if(pSps==NULL)printf("Error: calloc(), createPmrChannel()\n");
-		pSps->calcAdjust=gain_int_lpf_300_1_2/2;
-		pSps->inputGain=(1.0*M_Q8);
-		pSps->outputGain=(1.0*M_Q8);
-		pChan->prxVoiceMeasure=pSps->sink;
-		pChan->prxVoiceAdjust=&(pSps->outputGain);
-	}
-
-	if(pChan->rxDelayLineEnable)
-	{
-		TRACEF(1,("create delayline\n"));
-		pSps=pChan->spsDelayLine=pSps->nextSps=createPmrSps(pChan);
-		pSps->sigProc=DelayLine;
-		pSps->source=pChan->pRxSpeaker;
-		pSps->sink=pChan->pRxSpeaker;
-		pSps->enabled=0;
-		pSps->inputGain=1*M_Q8;
-		pSps->outputGain=1*M_Q8;
-		pSps->nSamples=pChan->nSamplesRx;
-		pSps->buffSize=4096;
-		pSps->buff=calloc(4096,2);	 		// one second maximum
-		pSps->buffLead = (SAMPLE_RATE_NETWORK*0.100);
-		pSps->buffOutIndex=0;
-	}
-
-	if(pChan->rxCdType==CD_XPMR_VOX)
-	{
-		TRACEF(1,("create vox measureblock\n"));
-		pChan->prxVoxMeas=calloc(pChan->nSamplesRx,2);
-
-		pSps=pChan->spsRxVox=pSps->nextSps=createPmrSps(pChan);
-		pSps->sigProc=MeasureBlock;
-		pSps->parentChan=pChan;
-		pSps->source=pChan->pRxBase;
-		pSps->sink=pChan->prxVoxMeas;
-		pSps->inputGain=1*M_Q8;
-		pSps->outputGain=1*M_Q8;
-		pSps->nSamples=pChan->nSamplesRx;
-		pSps->discfactor=3;
-		if(pChan->rxSqVoxAdj==0)
-			pSps->setpt=(0.011*M_Q15);
-		else
-			pSps->setpt=(pChan->rxSqVoxAdj);
-		pSps->hyst=(pSps->setpt/10);
-		pSps->enabled=1;
-	}
-
-	// tuning measure block
-	pSps=pChan->spsMeasure=pSps->nextSps=createPmrSps(pChan);
-	pSps->source=pChan->spsRx->sink;
-	pSps->sink=pChan->prxMeasure;
-	pSps->sigProc=MeasureBlock;
-	pSps->enabled=0;
-	pSps->nSamples=pChan->nSamplesRx;
-	pSps->discfactor=10;
-
-	pSps->nextSps=NULL;		// last sps in chain RX
-
-
-	// CREATE TRANSMIT CHAIN
-	TRACEF(1,("create tx\n"));
-	inputTmp=NULL;
-	pSps = NULL;
-
-	// allocate space for first sps and set pointers
-
-	// Tx HPF SubAudible
-	if(pChan->txHpfEnable)
-	{
-		pSps=createPmrSps(pChan);
-		pChan->spsTx=pSps;
-		pSps->source=pChan->pTxBase;
-		pSps->sink=pChan->pTxHpf;
-		pSps->sigProc=pmr_gp_fir;
-		pSps->enabled=1;
-		pSps->numChanOut=1;
-		pSps->selChanOut=0;
-		pSps->nSamples=pChan->nSamplesTx;
-		pSps->decimator=pSps->decimate=1;
-		pSps->interpolate=1;
-		pSps->ncoef=taps_fir_hpf_300_9_66;
-		pSps->size_coef=2;
-		pSps->coef=(void*)coef_fir_hpf_300_9_66;
-		pSps->nx=taps_fir_hpf_300_9_66;
-		pSps->size_x=2;
-		pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-		if(pSps==NULL)printf("Error: calloc(), createPmrChannel()\n");
-		pSps->calcAdjust=gain_fir_hpf_300_9_66;
-		pSps->inputGain=(1*M_Q8);
-		pSps->outputGain=(1*M_Q8);
-		inputTmp=pChan->pTxHpf;
-	}
-
-	// Tx PreEmphasis
-	if(pChan->txPreEmpEnable)
-	{
-		if(pSps==NULL) pSps=pChan->spsTx=createPmrSps(pChan);
-		else pSps=pSps->nextSps=createPmrSps(pChan);
-
-		pSps->source=inputTmp;
-		pSps->sink=pChan->pTxPreEmp;
-
-		pSps->sigProc=gp_diff;
-		pSps->enabled=1;
-		pSps->nSamples=pChan->nSamplesTx;
-
-		pSps->ncoef=taps_int_hpf_4000_1_2;
-		pSps->size_coef=2;
-		pSps->coef=(void*)coef_int_hpf_4000_1_2;
-
-		pSps->nx=taps_int_hpf_4000_1_2;
-		pSps->size_x=2;
-		pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-		if(pSps==NULL)printf("Error: calloc(), createPmrChannel()\n");
-		 
-		pSps->calcAdjust=gain_int_hpf_4000_1_2;
-		pSps->inputGain=(1*M_Q8);
-		pSps->outputGain=(1*M_Q8);	 // to match flat at 1KHz
-		inputTmp=pSps->sink;
-	}
-
-	// Tx Limiter
-	if(pChan->txLimiterEnable)
-	{
-		if(pSps==NULL) pSps=pChan->spsTx=createPmrSps(pChan);
-		else pSps=pSps->nextSps=createPmrSps(pChan);
-		pSps->source=inputTmp;
-		pSps->sink=pChan->pTxLimiter;
-		pSps->sigProc=SoftLimiter;
-		pSps->enabled=1;
-		pSps->nSamples=pChan->nSamplesTx;
-		pSps->inputGain=(1*M_Q8);
-		pSps->outputGain=(1*M_Q8);
-		pSps->setpt=12000;
-		inputTmp=pSps->sink;
-	}
-
-	// Composite Mix of Voice and LSD
-	if((pChan->txMixA==TX_OUT_COMPOSITE)||(pChan->txMixB==TX_OUT_COMPOSITE))
-	{
-		if(pSps==NULL)
-			pSps=pChan->spsTx=createPmrSps(pChan);
-		else
-			pSps=pSps->nextSps=createPmrSps(pChan);
-		pSps->source=inputTmp;
-		pSps->sourceB=pChan->pTxLsdLpf;		 //asdf ??? !!! maw pTxLsdLpf
-		pSps->sink=pChan->pTxComposite;
-		pSps->sigProc=pmrMixer;
-		pSps->enabled=1;
-		pSps->nSamples=pChan->nSamplesTx;
-		pSps->inputGain=2*M_Q8;
-		pSps->inputGainB=1*M_Q8/8;
-		pSps->outputGain=1*M_Q8;
-		pSps->setpt=0;
-		inputTmp=pSps->sink;
-		pChan->ptxCtcssAdjust=&pSps->inputGainB;
-	}
-
-	// Chan A Upsampler and Filter
-	if(pSps==NULL) pSps=pChan->spsTx=createPmrSps(pChan);
-	else pSps=pSps->nextSps=createPmrSps(pChan);
-
-	pChan->spsTxOutA=pSps;
-	if(!pChan->spsTx)pChan->spsTx=pSps;
-
-	if(pChan->txMixA==TX_OUT_COMPOSITE)
-	{
-		pSps->source=pChan->pTxComposite;
-	}
-	else if(pChan->txMixA==TX_OUT_LSD)
-	{
-		pSps->source=pChan->pTxLsdLpf;
-	}
-	else if(pChan->txMixA==TX_OUT_VOICE)
-	{
-		pSps->source=pChan->pTxHpf;
-	}
-	else if (pChan->txMixA==TX_OUT_AUX)
-	{
-		pSps->source=inputTmp;
-	}
-	else
-	{
-		pSps->source=NULL;		// maw sph asdf !!!	no blow up
-		pSps->source=inputTmp;
-	}
-
-	pSps->sink=pChan->pTxOut;
-	pSps->sigProc=pmr_gp_fir;
-	pSps->enabled=1;
-	pSps->numChanOut=2;
-	pSps->selChanOut=0;
-	pSps->nSamples=pChan->nSamplesTx;
-	pSps->interpolate=6;
-	pSps->ncoef=taps_fir_lpf_3K_1;
-	pSps->size_coef=2;
-	pSps->coef=(void*)coef_fir_lpf_3K_1;
-	pSps->nx=taps_fir_lpf_3K_1;
-	pSps->size_x=2;
-	pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-	if(pSps==NULL)printf("Error: calloc(), createPmrChannel()\n");
-	pSps->calcAdjust=gain_fir_lpf_3K_1;
-	pSps->inputGain=(1*M_Q8);
-	pSps->outputGain=(1*M_Q8);
-	if(pChan->txMixA==pChan->txMixB)pSps->monoOut=1;
-	else pSps->monoOut=0;
-
-
-	// Chan B Upsampler and Filter
-	if((pChan->txMixA!=pChan->txMixB)&&(pChan->txMixB!=TX_OUT_OFF))
-	{
-		if(pSps==NULL) pSps=pChan->spsTx=createPmrSps(pChan);
-		else pSps=pSps->nextSps=createPmrSps(pChan);
-
-		pChan->spsTxOutB=pSps;
-		if(pChan->txMixB==TX_OUT_COMPOSITE)
-		{
-			pSps->source=pChan->pTxComposite;
-		}
-		else if(pChan->txMixB==TX_OUT_LSD)
-		{
-			pSps->source=pChan->pTxLsdLpf;
-			// pChan->ptxCtcssAdjust=&pSps->inputGain;
-		}
-		else if(pChan->txMixB==TX_OUT_VOICE)
-		{
-			pSps->source=inputTmp;
-		}
-		else if(pChan->txMixB==TX_OUT_AUX)
-		{
-			pSps->source=pChan->pTxHpf;
-		}
-		else
-		{
-			pSps->source=NULL;
-		}
-
-		pSps->sink=pChan->pTxOut;
-		pSps->sigProc=pmr_gp_fir;
-		pSps->enabled=1;
-		pSps->numChanOut=2;
-		pSps->selChanOut=1;
-		pSps->mixOut=0;
-		pSps->nSamples=pChan->nSamplesTx;
-		pSps->interpolate=6;
-		pSps->ncoef=taps_fir_lpf_3K_1;
-		pSps->size_coef=2;
-		pSps->coef=(void*)coef_fir_lpf_3K_1;
-		pSps->nx=taps_fir_lpf_3K_1;
-		pSps->size_x=2;
-		pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-		if(pSps==NULL)printf("Error: calloc(), createPmrChannel()\n");
-		pSps->calcAdjust=(gain_fir_lpf_3K_1);
-		pSps->inputGain=(1*M_Q8);
-		pSps->outputGain=(1*M_Q8);
-	}
-
-	pSps->nextSps=NULL;
-
-	// Configure Coded Signaling
-	code_string_parse(pChan);
-
-	pChan->smode=SMODE_NULL;
-	pChan->smodewas=SMODE_NULL;
-	pChan->smodetime=2500;
-	pChan->smodetimer=0;
-	pChan->b.smodeturnoff=0;
-
-	pChan->txsettletimer=0;
-
-	TRACEF(1,("createPmrChannel() end\n"));
-
-	return pChan;
-}
-/*
-*/
-i16 destroyPmrChannel(t_pmr_chan *pChan)
-{
-	#if XPMR_DEBUG0 == 1
-	i16 i;
-	#endif
-	t_pmr_sps  	*pmr_sps, *tmp_sps;
-
-	TRACEF(1,("destroyPmrChannel()\n"));
-	
-	free(pChan->pRxDemod);
-	free(pChan->pRxNoise);
-	free(pChan->pRxBase);
-	free(pChan->pRxHpf);
-	free(pChan->pRxLsd);
-	free(pChan->pRxSpeaker);
-	free(pChan->pRxDcTrack);
-	if(pChan->pRxLsdLimit)free(pChan->pRxLsdLimit);
-	free(pChan->pTxBase);
-	free(pChan->pTxHpf);
-	free(pChan->pTxPreEmp);
-	free(pChan->pTxLimiter);
-	free(pChan->pTxLsd);
-	free(pChan->pTxLsdLpf);
-	if(pChan->pTxComposite)free(pChan->pTxComposite);
-	free(pChan->pTxOut);
-
-	if(pChan->prxMeasure)free(pChan->prxMeasure);
-	if(pChan->pSigGen0)free(pChan->pSigGen0);
-	if(pChan->pSigGen1)free(pChan->pSigGen1);
-	 
-
-	#if XPMR_DEBUG0 == 1
-	//if(pChan->prxDebug)free(pChan->prxDebug);
-	if(pChan->ptxDebug)free(pChan->ptxDebug);
-	free(pChan->prxDebug0);
- 	free(pChan->prxDebug1);
-	free(pChan->prxDebug2);
-	free(pChan->prxDebug3);
-
-	free(pChan->ptxDebug0);
- 	free(pChan->ptxDebug1);
-	free(pChan->ptxDebug2);
-	free(pChan->ptxDebug3);
-
-	free(pChan->rxCtcss->pDebug0);
-	free(pChan->rxCtcss->pDebug1);
-
-	for(i=0;i<CTCSS_NUM_CODES;i++)
-	{
-		free(pChan->rxCtcss->tdet[i].pDebug0);
-		free(pChan->rxCtcss->tdet[i].pDebug1);
-		free(pChan->rxCtcss->tdet[i].pDebug2);
-		free(pChan->rxCtcss->tdet[i].pDebug3);
-	}
-	#endif
-
-	pChan->dd.option=8;
-	dedrift(pChan);
-
-	free(pChan->pRxCtcss);
-
-	pmr_sps=pChan->spsRx;
-
-	if(pChan->sdbg)free(pChan->sdbg);
-
-	while(pmr_sps)
-	{
-		tmp_sps = pmr_sps;
-		pmr_sps = tmp_sps->nextSps;
-		destroyPmrSps(tmp_sps);
-	}
-
-	free(pChan);
-
-	return 0;
-}
-/*
-*/
-t_pmr_sps *createPmrSps(t_pmr_chan *pChan)
-{
-	t_pmr_sps  *pSps;
-
-	TRACEF(1,("createPmrSps()\n"));
-
-	pSps = (t_pmr_sps *)calloc(sizeof(t_pmr_sps),1);
-
-	if(!pSps)printf("Error: createPmrSps()\n");
-
-	pSps->parentChan=pChan;
-	pSps->index=pChan->spsIndex++;
-
-	// pSps->x=calloc(pSps->nx,pSps->size_x);
-
-	return pSps;
-}
-/*
-*/
-i16 destroyPmrSps(t_pmr_sps  *pSps)
-{
-	TRACEJ(1,("destroyPmrSps(%i)\n",pSps->index));
-
-	if(pSps->x!=NULL)free(pSps->x);
-	free(pSps);
-	return 0;
-}
-/*
-	PmrTx - takes data from network and holds it for PmrRx
-*/
-i16 PmrTx(t_pmr_chan *pChan, i16 *input)
-{
-	pChan->frameCountTx++;
-
-	TRACEF(5,("PmrTx() start %i\n",pChan->frameCountTx));
-
-	#if XPMR_PPTP == 99
-	pptp_p2^=1;
-	if(pptp_p2)ioctl(ppdrvdev,PPDRV_IOC_PINSET,LP_PIN02);
-	else ioctl(ppdrvdev,PPDRV_IOC_PINCLEAR,LP_PIN02);
-	#endif
-
-	if(pChan==NULL){
-		printf("PmrTx() pChan == NULL\n");
-		return 1;
-	}
-
-	#if XPMR_DEBUG0 == 1
-	if(pChan->b.rxCapture && pChan->tracetype==5)
-	{
-		memcpy(pChan->pTxInput,input,pChan->nSamplesRx*2);
-	}
-	#endif
-
-	//if(pChan->b.radioactive)pChan->dd.debug=1;
-	//else pChan->dd.debug=0;
-
-	dedrift_write(pChan,input);
-
-	return 0;
-}
-/*
-	PmrRx handles a block of data from the usb audio device
-*/
-i16 PmrRx(t_pmr_chan *pChan, i16 *input, i16 *outputrx, i16 *outputtx)
-{
-	int i,hit;
-	float f=0;
-	t_pmr_sps *pmr_sps;
-
-	TRACEC(5,("PmrRx(%p %p %p %p)\n",pChan, input, outputrx, outputtx));
-
-    #if XPMR_PPTP == 1
-	if(pChan->b.radioactive)
-	{
-		pptp_write(1,pChan->frameCountRx&0x00000001);
-	}
-	#endif
-
-	if(pChan==NULL){
-		printf("PmrRx() pChan == NULL\n");
-		return 1;
-	}
-
-	pChan->frameCountRx++;
-
-	#if XPMR_DEBUG0 == 1
-	if(pChan->b.rxCapture)
-	{
-		//if(pChan->prxDebug)memset((void *)pChan->prxDebug,0,pChan->nSamplesRx*XPMR_DEBUG_CHANS*2);
-		if(pChan->ptxDebug)memset((void *)pChan->ptxDebug,0,pChan->nSamplesRx*XPMR_DEBUG_CHANS*2);
-		if(pChan->sdbg->buffer)
-		{
-			memset((void *)pChan->sdbg->buffer,0,pChan->nSamplesRx*XPMR_DEBUG_CHANS*2);
-			pChan->prxDebug=pChan->sdbg->buffer;
-		}
-	}
-	#endif
-
-	pmr_sps=pChan->spsRx;		// first sps
-	pmr_sps->source=input;
-
-	if(outputrx!=NULL)pChan->spsRxOut->sink=outputrx;	 //last sps
-
-	#if 0
-	if(pChan->inputBlanking>0)
-	{
-		pChan->inputBlanking-=pChan->nSamplesRx;
-		if(pChan->inputBlanking<0)pChan->inputBlanking=0;
-		for(i=0;i<pChan->nSamplesRx*6;i++)
-			input[i]=0;
-	}
-	#endif
-
-	if( pChan->rxCpuSaver && !pChan->rxCarrierDetect && 
-	    pChan->smode==SMODE_NULL &&
-	   !pChan->txPttIn && !pChan->txPttOut)
-	{
-		if(!pChan->b.rxhalted)
-		{
-			if(pChan->spsRxHpf)pChan->spsRxHpf->enabled=0;
-			if(pChan->spsRxDeEmp)pChan->spsRxDeEmp->enabled=0;
-			pChan->b.rxhalted=1;
-			TRACEC(1,("PmrRx() rx sps halted\n"));
-		}
-	}
-	else if(pChan->b.rxhalted)
-	{
-		if(pChan->spsRxHpf)pChan->spsRxHpf->enabled=1;
-		if(pChan->spsRxDeEmp)pChan->spsRxDeEmp->enabled=1;
-		pChan->b.rxhalted=0;
-		TRACEC(1,("PmrRx() rx sps un-halted\n"));
-	}
-
-	i=0;
-	while(pmr_sps!=NULL && pmr_sps!=0)
-	{
-		TRACEC(5,("PmrRx() sps %i\n",i++));
-		pmr_sps->sigProc(pmr_sps);
-		pmr_sps = (t_pmr_sps *)(pmr_sps->nextSps);
-		//pmr_sps=NULL;	// sph maw
-	}
-
-	#define XPMR_VOX_HANGTIME	2000
-
-	if(pChan->rxCdType==CD_XPMR_VOX)
-	{
-		if(pChan->spsRxVox->compOut)
-		{
-			pChan->rxVoxTimer=XPMR_VOX_HANGTIME;    //VOX HangTime in ms
-		}
-		if(pChan->rxVoxTimer>0)
-		{
-			pChan->rxVoxTimer-=MS_PER_FRAME;
-			pChan->rxCarrierDetect=1;
-		}
-		else
-		{
-			pChan->rxVoxTimer=0;
-			pChan->rxCarrierDetect=0;
-		}
-	}
-	else
-	{
-		pChan->rxCarrierDetect=!pChan->spsRx->compOut;
-	}
-
-	// stop and start these engines instead to eliminate falsing
-	if( pChan->b.ctcssRxEnable && 
-	    ( (!pChan->b.rxhalted || 
-		   pChan->rxCtcss->decode!=CTCSS_NULL || pChan->smode==SMODE_CTCSS) &&
-		(pChan->smode!=SMODE_DCS&&pChan->smode!=SMODE_LSD) ) 
-	  )
-	{
-		ctcss_detect(pChan);
-	}
-
-	#if 1
-	if(pChan->txPttIn!=pChan->b.pttwas)
-	{
-		pChan->b.pttwas=pChan->txPttIn;
-		TRACEC(1,("PmrRx() txPttIn=%i\n",pChan->b.pttwas));
-	}
-	#endif
-
-	#ifdef XPMRX_H
-	xpmrx(pChan,XXO_RXDECODE);
-	#endif
-
-	if(pChan->smodetimer>0 && !pChan->txPttIn)
-	{
-		pChan->smodetimer-=MS_PER_FRAME;
-	 	
-		if(pChan->smodetimer<=0)
-		{
-			pChan->smodetimer=0;
-			pChan->smodewas=pChan->smode;
-			pChan->smode=SMODE_NULL;
-			pChan->b.smodeturnoff=1;
-			TRACEC(1,("smode timeout. smode was=%i\n",pChan->smodewas));
-		}
-	}
-
-	if(pChan->rxCtcss->decode > CTCSS_NULL && 
-	   (pChan->smode==SMODE_NULL||pChan->smode==SMODE_CTCSS) )
-	{
-		if(pChan->smode!=SMODE_CTCSS)
-		{
-			TRACEC(1,("smode set=%i  code=%i\n",pChan->smode,pChan->rxCtcss->decode));
-			pChan->smode=pChan->smodewas=SMODE_CTCSS;
-		}
-		pChan->smodetimer=pChan->smodetime;
-	}
-
-	#ifdef HAVE_XPMRX
-	xpmrx(pChan,XXO_LSDCTL);
-	#endif
-
-	//TRACEX(("PmrRx() tx portion.\n"));
-
-	// handle radio transmitter ptt input
-	hit=0;
-	if( !(pChan->smode==SMODE_DCS||pChan->smode==SMODE_LSD) )
-	{
-	 
-	if( pChan->txPttIn && pChan->txState==CHAN_TXSTATE_IDLE )
-	{
-		TRACEC(1,("txPttIn==1 from CHAN_TXSTATE_IDLE && !SMODE_LSD. codeindex=%i  %i \n",pChan->rxCtcss->decode, pChan->rxCtcssMap[pChan->rxCtcss->decode] ));
-		pChan->dd.b.doitnow=1;
-
-	    if(pChan->smode==SMODE_CTCSS && !pChan->b.txCtcssInhibit)
-		{
-			if(pChan->rxCtcss->decode>CTCSS_NULL)
-			{
-				if(pChan->rxCtcssMap[pChan->rxCtcss->decode]!=CTCSS_RXONLY)
-				{
-					f=freq_ctcss[pChan->rxCtcssMap[pChan->rxCtcss->decode]];
-				}
-			}
-			else
-			{
-				f=pChan->txctcssdefault_value;	
-			}
-			TRACEC(1,("txPttIn - Start CTCSSGen  %f \n",f));
-			if(f)
-			{
-				t_pmr_sps *pSps;
-	
-				pChan->spsSigGen0->freq=f*10;
-				pSps=pChan->spsTxLsdLpf;
-				pSps->enabled=1;
-
-				#if 0
-				if(f>203.0)
-				{
-					pSps->ncoef=taps_fir_lpf_250_9_66;
-					pSps->size_coef=2;
-					pSps->coef=(void*)coef_fir_lpf_250_9_66;
-					pSps->nx=taps_fir_lpf_250_9_66;
-					pSps->size_x=2;
-					pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-					pSps->calcAdjust=gain_fir_lpf_250_9_66;
-				}
-				else
-				{
-					pSps->ncoef=taps_fir_lpf_215_9_88;
-					pSps->size_coef=2;
-					pSps->coef=(void*)coef_fir_lpf_215_9_88;
-					pSps->nx=taps_fir_lpf_215_9_88;
-					pSps->size_x=2;
-					pSps->x=(void*)(calloc(pSps->nx,pSps->size_x));
-					pSps->calcAdjust=gain_fir_lpf_215_9_88;
-				}
-				#endif
-
-				pChan->spsSigGen0->option=1;
-				pChan->spsSigGen0->enabled=1;
-			    pChan->spsSigGen0->discounterl=0;
-		    }
-		}
-		else if(pChan->smode==SMODE_NULL && pChan->txcodedefaultsmode==SMODE_CTCSS && !pChan->b.txCtcssInhibit)
-		{
-		    TRACEC(1,("txPtt Encode txcodedefaultsmode==SMODE_CTCSS %f\n",pChan->txctcssdefault_value));
-			pChan->spsSigGen0->freq=pChan->txctcssdefault_value*10;
-			pChan->spsSigGen0->option=1;
-		    pChan->spsSigGen0->enabled=1;
-			pChan->spsSigGen0->discounterl=0;
-			pChan->smode=SMODE_CTCSS;
-			pChan->smodetimer=pChan->smodetime;
-		}
-		else if(pChan->txcodedefaultsmode==SMODE_NULL||pChan->b.txCtcssInhibit)
-		{
-			TRACEC(1,("txPtt Encode txcodedefaultsmode==SMODE_NULL\n"));
-		}
-		else
-		{
-			printf   ("ERROR: txPttIn=%i NOT HANDLED PROPERLY.\n",pChan->txPttIn);
-			TRACEC(1,("ERROR: txPttIn=%i NOT HANDLED PROPERLY.\n",pChan->txPttIn));
-		}
-
-		pChan->txState = CHAN_TXSTATE_ACTIVE;
-		pChan->txPttOut=1;
-
-		pChan->txsettletimer=pChan->txsettletime;
-
-		if(pChan->spsTxOutA)pChan->spsTxOutA->enabled=1;
-		if(pChan->spsTxOutB)pChan->spsTxOutB->enabled=1;
-		if(pChan->spsTxLsdLpf)pChan->spsTxLsdLpf->enabled=1;
-		if(pChan->txfreq)pChan->b.reprog=1;
-		TRACEC(1,("PmrRx() TxOn\n"));
-	}
-	else if(pChan->txPttIn && pChan->txState==CHAN_TXSTATE_ACTIVE)
-	{
-		// pChan->smode=SMODE_CTCSS;
-		pChan->smodetimer=pChan->smodetime;
-	}
-	else if(!pChan->txPttIn && pChan->txState==CHAN_TXSTATE_ACTIVE)
-	{
-		TRACEC(1,("txPttIn==0 from CHAN_TXSTATE_ACTIVE\n"));
-		if(pChan->smode==SMODE_CTCSS && !pChan->b.txCtcssInhibit)
-		{
-			if( pChan->txTocType==TOC_NONE || !pChan->b.ctcssTxEnable )
-			{
-				TRACEC(1,("Tx Off Immediate.\n"));
-				pChan->spsSigGen0->option=3;
-				pChan->txBufferClear=3;
-				pChan->txState=CHAN_TXSTATE_FINISHING;
-	        }
-			else if(pChan->txTocType==TOC_NOTONE)
-			{
-				pChan->txState=CHAN_TXSTATE_TOC;
-				pChan->txHangTime=TOC_NOTONE_TIME/MS_PER_FRAME;
-				pChan->spsSigGen0->option=3;
-				TRACEC(1,("Tx Turn Off No Tone Start.\n"));
-			}
-	 		else
-			{
-				pChan->txState=CHAN_TXSTATE_TOC;
-				pChan->txHangTime=0;
-				pChan->spsSigGen0->option=2;
-				TRACEC(1,("Tx Turn Off Phase Shift Start.\n"));
-			}
-	    }
-		else
-		{
-		    pChan->txBufferClear=3;
-			pChan->txState=CHAN_TXSTATE_FINISHING;
-			TRACEC(1,("Tx Off No SMODE to Finish.\n"));
-		}
-	}
-	else if(pChan->txState==CHAN_TXSTATE_TOC)
-	{
-		if( pChan->txPttIn && pChan->smode==SMODE_CTCSS )
-		{
-			TRACEC(1,("Tx Key During HangTime\n"));
-			pChan->txState = CHAN_TXSTATE_ACTIVE;
-			pChan->spsSigGen0->option=1;
-			pChan->spsSigGen0->enabled=1;
-			pChan->spsSigGen0->discounterl=0;
-			hit=0;
-		}
-		else if(pChan->txHangTime)
-		{
-			if(--pChan->txHangTime==0)pChan->txState=CHAN_TXSTATE_FINISHING;
-		}
-		else if(pChan->txHangTime<=0 && pChan->spsSigGen0->state==0)
-		{
-			pChan->txBufferClear=3;
-			pChan->txState=CHAN_TXSTATE_FINISHING;
-			TRACEC(1,("Tx Off TOC.\n"));
-		}
-	}
-	else if(pChan->txState==CHAN_TXSTATE_FINISHING)
-	{
-		if(--pChan->txBufferClear<=0)
-			pChan->txState=CHAN_TXSTATE_COMPLETE;
-	}
-	else if(pChan->txState==CHAN_TXSTATE_COMPLETE)
-	{
-		hit=1;	
-	}
-	}	// end of if SMODE==LSD
-
-	if(hit)
-	{
-		pChan->txPttOut=0;
-		pChan->spsSigGen0->option=3;
-		pChan->txState=CHAN_TXSTATE_IDLE;
-		if(pChan->spsTxLsdLpf)pChan->spsTxLsdLpf->option=3;
-		if(pChan->spsTxOutA)pChan->spsTxOutA->option=3;
-		if(pChan->spsTxOutB)pChan->spsTxOutB->option=3;
-		if(pChan->rxfreq||pChan->txfreq)pChan->b.reprog=1;
-		TRACEC(1,("Tx Off hit.\n"));
-	}
-			  
-	if(pChan->b.reprog)
-	{
-		pChan->b.reprog=0;	
-		progdtx(pChan);
-	}
-
-	if(pChan->txsettletimer && pChan->txPttHid )
-	{
-		pChan->txsettletimer-=MS_PER_FRAME;
-		if(pChan->txsettletimer<0)pChan->txsettletimer=0;
-	}
-
-	// enable this after we know everything else is working
-	if( pChan->txCpuSaver && 
-	    !pChan->txPttIn && !pChan->txPttOut && 
-	    pChan->txState==CHAN_TXSTATE_IDLE &&
-	    !pChan->dd.b.doitnow 
-	    ) 
-	{
-		if(!pChan->b.txhalted)
-		{
-			pChan->b.txhalted=1;
-			TRACEC(1,("PmrRx() tx sps halted\n"));
-		}
-	}
-	else if(pChan->b.txhalted)
-	{
-		pChan->dd.b.doitnow=1;
-		pChan->b.txhalted=0;
-		TRACEC(1,("PmrRx() tx sps un-halted\n"));
-	}
-
-	if(pChan->b.txhalted)return(1);
-
-	if(pChan->b.startSpecialTone)
-	{
-		pChan->b.startSpecialTone=0;
-		pChan->spsSigGen1->option=1;
-		pChan->spsSigGen1->enabled=1;
-		pChan->b.doingSpecialTone=1;
-	} 
-	else if(pChan->b.stopSpecialTone)
-	{
-		pChan->b.stopSpecialTone=0;
-		pChan->spsSigGen1->option=0;
-		pChan->b.doingSpecialTone=0;
-		pChan->spsSigGen1->enabled=0;
-	} 
-	else if(pChan->b.doingSpecialTone)
-	{
-		pChan->spsSigGen1->sink=outputtx;
-		pChan->spsSigGen1->sigProc(pChan->spsSigGen1);
-		for(i=0;i<(pChan->nSamplesTx*2*6);i+=2)outputtx[i+1]=outputtx[i];
-		return 0;
-	}
-
-	if(pChan->spsSigGen0 && pChan->spsSigGen0->enabled )
-	{
-		pChan->spsSigGen0->sigProc(pChan->spsSigGen0);
-	}
-
-	if(pChan->spsSigGen1 && pChan->spsSigGen1->enabled)
-	{
-		pChan->spsSigGen1->sigProc(pChan->spsSigGen1);
-	}
-
-	#ifdef XPMRX_H
-	pChan->spsLsdGen->sigProc(pChan->spsLsdGen);	// maw sph ???
-	#endif
-
-	// Do Low Speed Data Low Pass Filter
-	pChan->spsTxLsdLpf->sigProc(pChan->spsTxLsdLpf);
-
-	// Do Voice
-	pmr_sps=pChan->spsTx;
-
-	// get tx data from de-drift process
-	pChan->dd.option=0;
-	pChan->dd.ptr=pChan->pTxBase;
-	dedrift(pChan);
-
-	// tx process
-	if(!pChan->spsSigGen1->enabled)
-	{
-		pmr_sps->source=pChan->pTxBase;
-	}
-	else input=pmr_sps->source;
-
-	if(outputtx!=NULL)
-	{
-		if(pChan->spsTxOutA)pChan->spsTxOutA->sink=outputtx;
-		if(pChan->spsTxOutB)pChan->spsTxOutB->sink=outputtx;
-	}
-
-	i=0;
-	while(pmr_sps!=NULL && pmr_sps!=0)
-	{
-		//TRACEF(1,("PmrTx() sps %i\n",i++));
-		pmr_sps->sigProc(pmr_sps);
-		pmr_sps = (t_pmr_sps *)(pmr_sps->nextSps);
-	}
-
-	//TRACEF(1,("PmrTx() - outputs \n"));
-	if(pChan->txMixA==TX_OUT_OFF || !pChan->txPttOut){
-		for(i=0;i<pChan->nSamplesTx*2*6;i+=2)outputtx[i]=0;
-	}
-
-	if(pChan->txMixB==TX_OUT_OFF || !pChan->txPttOut ){
-		for(i=0;i<pChan->nSamplesTx*2*6;i+=2)outputtx[i+1]=0;
-	}
-
-	#if XPMR_PPTP == 1
-	if(	pChan->b.radioactive && pChan->b.pptp_p1!=pChan->txPttOut)
-	{
-		pChan->b.pptp_p1=pChan->txPttOut;
-		pptp_write(0,pChan->b.pptp_p1);
-	}
-	#endif
-
-	#if XPMR_DEBUG0 == 1
-	// TRACEF(1,("PmrRx() - debug outputs \n"));
-	if(pChan->b.rxCapture){
-		for(i=0;i<pChan->nSamplesRx;i++)
-		{
-			pChan->pRxDemod[i]=input[i*2*6];
-			pChan->pTstTxOut[i]=outputtx[i*2*6+0]; // txa
-			//pChan->pTstTxOut[i]=outputtx[i*2*6+1]; // txb
-			TSCOPE((RX_NOISE_TRIG, pChan->sdbg, i, (pChan->rxCarrierDetect*XPMR_TRACE_AMP)-XPMR_TRACE_AMP/2));
-			TSCOPE((RX_CTCSS_DECODE, pChan->sdbg, i, pChan->rxCtcss->decode*(M_Q14/CTCSS_NUM_CODES)));
-			TSCOPE((RX_SMODE, pChan->sdbg, i, pChan->smode*(XPMR_TRACE_AMP/4)));
-			TSCOPE((TX_PTT_IN, pChan->sdbg, i, (pChan->txPttIn*XPMR_TRACE_AMP)-XPMR_TRACE_AMP/2));
-			TSCOPE((TX_PTT_OUT, pChan->sdbg, i, (pChan->txPttOut*XPMR_TRACE_AMP)-XPMR_TRACE_AMP/2));
-			TSCOPE((TX_DEDRIFT_LEAD, pChan->sdbg, i, pChan->dd.lead*8));
-			TSCOPE((TX_DEDRIFT_ERR, pChan->sdbg, i, pChan->dd.err*16));
-			TSCOPE((TX_DEDRIFT_FACTOR, pChan->sdbg, i, pChan->dd.factor*16));
-			TSCOPE((TX_DEDRIFT_DRIFT, pChan->sdbg, i, pChan->dd.drift*16));
-		}
-    }
-	#endif
-
-	strace2(pChan->sdbg);
-	TRACEC(5,("PmrRx() return  cd=%i smode=%i  txPttIn=%i  txPttOut=%i \n",pChan->rxCarrierDetect,pChan->smode,pChan->txPttIn,pChan->txPttOut));
-	return 0;
-}
-/*
-	parallel binary programming of an RF Transceiver*/
-
-void	ppbinout	(u8 chan)
-{
-#if(DTX_PROG == 1)
-	i32	i;
-
-	if (ppdrvdev == 0)
-    	ppdrvdev = open("/dev/ppdrv_device", 0);
-
-    if (ppdrvdev < 0)
-    {
-        ast_log(LOG_ERROR, "open /dev/ppdrv_ppdrvdev returned %i\n",ppdrvdev);
-		return;
-	}
-
-	i=0;
-	if(chan&0x01)i|=BIN_PROG_0;
-	if(chan&0x02)i|=BIN_PROG_1;
-	if(chan&0x04)i|=BIN_PROG_2;
-	if(chan&0x08)i|=BIN_PROG_3;
-
-	ioctl(ppdrvdev, PPDRV_IOC_PINMODE_OUT, BIN_PROG_3|BIN_PROG_2|BIN_PROG_1|BIN_PROG_0);
-	//ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR,    BIN_PROG_3|BIN_PROG_2|BIN_PROG_1|BIN_PROG_0);
-	//ioctl(ppdrvdev, PPDRV_IOC_PINSET, i );
-	ioctl(ppdrvdev, PPDRV_IOC_PINSET,    BIN_PROG_3|BIN_PROG_2|BIN_PROG_1|BIN_PROG_0);
-	ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR, i );
-
-    // ioctl(ppdrvdev, PPDRV_IOC_PINSET, BIN_PROG_3|BIN_PROG_2|BIN_PROG_1|BIN_PROG_0 ); 
-    ast_log(LOG_NOTICE, "mask=%i 0x%x\n",i,i); 
-#endif
-}
-/*
-	SPI Programming of an RF Transceiver
-	need to add permissions check and mutex
-*/
-/*
-	need to add permissions check and mutex
-*/
-void	ppspiout	(u32 spidata)
-{
-#if(DTX_PROG == 1)
-	static char firstrun=0;
-	i32	i,ii;
-	u32	bitselect;
-
-    if (ppdrvdev < 0)
-    {
-        ast_log(LOG_ERROR, "no parallel port permission ppdrvdev %i\n",ppdrvdev);
-		exit(0);
-	}
-
-	ioctl(ppdrvdev, PPDRV_IOC_PINMODE_OUT, DTX_CLK | DTX_DATA | DTX_ENABLE | DTX_TXPWR | DTX_TX );
-	ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR, DTX_CLK | DTX_DATA | DTX_ENABLE | DTX_TXPWR | DTX_TX );
-
-	if(firstrun==0)
-	{
-		firstrun=1;
-		for(ii=0;ii<PP_BIT_TIME*200;ii++);	
-	}
-	else
-	{
-		for(ii=0;ii<PP_BIT_TIME*4;ii++);
-	}
-
-	bitselect=0x00080000;
-
-	for(i=0;i<(PP_REG_LEN-12);i++)
-	{
-		if((bitselect&spidata))
-			ioctl(ppdrvdev, PPDRV_IOC_PINSET, DTX_DATA );
-		else
-			ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR, DTX_DATA );
-
-		for(ii=0;ii<PP_BIT_TIME;ii++);
-
-		ioctl(ppdrvdev, PPDRV_IOC_PINSET, DTX_CLK );
-		for(ii=0;ii<PP_BIT_TIME;ii++);
-		ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR, DTX_CLK );
-		for(ii=0;ii<PP_BIT_TIME;ii++);
-
-		bitselect=(bitselect>>1);
-	}
-	ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR, DTX_CLK | DTX_DATA );
-	ioctl(ppdrvdev, PPDRV_IOC_PINSET, DTX_ENABLE );
-	for(ii=0;ii<PP_BIT_TIME;ii++);
-	ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR, DTX_ENABLE );
-#endif
-}
-/*
-	mutex needed
-	now assumes calling thread secures permissions
-	could set up a separate thread to program the radio? yuck!
-
-*/
-void	progdtx(t_pmr_chan *pChan)
-{
-#if(DTX_PROG == 1)	
-	//static u32	progcount=0;
-
-	u32 reffreq;
-	u32 stepfreq;
-	u32 rxiffreq;
-	u32 synthfreq;
-	u32 shiftreg;
-	u32 tmp;
-
-	TRACEC(1,("\nprogdtx() %i %i %i\n",pChan->rxfreq,pChan->txfreq,0));
-
-	if (ppdrvdev == 0)
-    	ppdrvdev = open("/dev/ppdrv_device", 0);
-
-    if (ppdrvdev < 0)
-    {
-        ast_log(LOG_ERROR, "open /dev/ppdrv_ppdrvdev returned %i\n",ppdrvdev);
-		exit(0);
-	}
-
-	if(pChan->rxfreq>200000000)
-	{
-		reffreq=16012500;
-		stepfreq=12500;
-		rxiffreq=21400000;
-	}
-	else
-	{
-		reffreq=16000000;
-		stepfreq=5000;
-		rxiffreq=10700000;
-	}
-
-	shiftreg=(reffreq/stepfreq)<<1;
-	shiftreg=shiftreg|0x00000001;
-
-	ppspiout(shiftreg);
-
-	if(pChan->txPttOut)
-		synthfreq=pChan->txfreq;
-	else
-		synthfreq=pChan->rxfreq-rxiffreq;
-
-	shiftreg=(synthfreq/stepfreq)<<1;
-	tmp=(shiftreg&0xFFFFFF80)<<1;
-	shiftreg=tmp+(shiftreg&0x0000007F);
-
-	ppspiout(shiftreg);
-
-	ioctl(ppdrvdev, PPDRV_IOC_PINMODE_OUT, DTX_CLK | DTX_DATA | DTX_ENABLE | DTX_TXPWR | DTX_TX );
-	ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR, DTX_CLK | DTX_DATA | DTX_ENABLE );
-
-	if(pChan->txPttOut)
-	{
-		ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR, DTX_TXPWR );
-		ioctl(ppdrvdev, PPDRV_IOC_PINSET, DTX_TX );
-		if(pChan->txpower && 0) ioctl(ppdrvdev, PPDRV_IOC_PINSET, DTX_TXPWR );
-	}
-	else
-	{
-		ioctl(ppdrvdev, PPDRV_IOC_PINCLEAR, DTX_TX | DTX_TXPWR );
-	}
-#endif
-}
-
-/*	dedrift
-	reconciles clock differences between the usb adapter and 
-	asterisk's frame rate clock	
-	take out all accumulated drift error on these events:
-	before transmitter on
-	when ptt release from mobile units detected
-*/
-void dedrift(t_pmr_chan *pChan)
-{
-	TRACEC(5,("dedrift()\n"));
-
-	if(pChan->dd.option==9)
-	{
-		TRACEF(1,("dedrift(9)\n"));
-		pChan->dd.framesize=DDB_FRAME_SIZE;
-		pChan->dd.frames=DDB_FRAMES_IN_BUFF;
-		pChan->dd.buffersize = pChan->dd.frames * pChan->dd.framesize;
-		pChan->dd.buff=calloc(DDB_FRAME_SIZE*DDB_FRAMES_IN_BUFF,2);
-		pChan->dd.modulus=DDB_ERR_MODULUS;
-		pChan->dd.inputindex=0;
-		pChan->dd.outputindex=0;
-		pChan->dd.skew = pChan->dd.lead=0;
-		pChan->dd.z1=0;
-		pChan->dd.debug=0;
-		pChan->dd.debugcnt=0;
-		pChan->dd.lock=pChan->dd.b.txlock=pChan->dd.b.rxlock=0;
-		pChan->dd.initcnt=2;
-		pChan->dd.timer=10000/20;
-		pChan->dd.drift=0;
-		pChan->dd.factor=pChan->dd.x1 = pChan->dd.x0 = pChan->dd.y1 = pChan->dd.y0 = 0;
-		pChan->dd.txframecnt=pChan->dd.rxframecnt=0;
-		// clear the buffer too!
-		return;
-	}
-	else if(pChan->dd.option==8)
-	{
-		free(pChan->dd.buff);
-		pChan->dd.lock=0;
-		pChan->dd.b.txlock=pChan->dd.b.rxlock=0;
-		return;
-	}
-	else if(pChan->dd.initcnt==0)
-	{
-		const i32 a0 =  26231;
-		const i32 a1 =  26231;
-		const i32 b0 =  32768;
-		const i32 b1 = -32358;
-		const i32 dg =	128;
-		void *vptr;
-		i16 inputindex;
-		i16 indextweak;
-	    i32 accum;
-
-		inputindex = pChan->dd.inputindex;
-		pChan->dd.skew = pChan->dd.txframecnt-pChan->dd.rxframecnt;
-		pChan->dd.rxframecnt++;
-
-		// pull data from buffer
-		if( (pChan->dd.outputindex + pChan->dd.framesize) > pChan->dd.buffersize )
-		{
-			i16 dofirst,donext;
-
-			dofirst = pChan->dd.buffersize - pChan->dd.outputindex;
-		    donext = pChan->dd.framesize - dofirst;
-			vptr = (void*)(pChan->dd.ptr);
-			memcpy(vptr,(void*)(pChan->dd.buff + pChan->dd.outputindex),dofirst*2);
-			vptr=(void*)(pChan->dd.ptr + dofirst);
-			memcpy(vptr,(void*)(pChan->dd.buff),donext*2);
-		}
-		else
-		{
-			memcpy(pChan->dd.ptr,(void*)(pChan->dd.buff + pChan->dd.outputindex),pChan->dd.framesize*2);
-		}
-		
-		// compute clock error and correction factor
-		if(pChan->dd.outputindex > inputindex)
-		{
-			pChan->dd.lead = (inputindex + pChan->dd.buffersize) - pChan->dd.outputindex;
-		}
-	    else
-		{
-			pChan->dd.lead = inputindex - pChan->dd.outputindex;
-		}
-		pChan->dd.err = pChan->dd.lead - (pChan->dd.buffersize/2);
-
-		// WinFilter, IIR Fs=50, Fc=0.1
-		pChan->dd.x1 = pChan->dd.x0;
-	    pChan->dd.y1 = pChan->dd.y0;
-		pChan->dd.x0 = pChan->dd.err;
-	    pChan->dd.y0 = a0 * pChan->dd.x0;
-	    pChan->dd.y0 += (a1 * pChan->dd.x1 - (b1 * pChan->dd.y1));
-	    pChan->dd.y0 /= b0;
-		accum = pChan->dd.y0/dg;
-
-		pChan->dd.factor=accum;
-		indextweak=0;
-
-		#if 1
-		// event sync'd correction
-		if(pChan->dd.b.doitnow)
-		{
-		    pChan->dd.b.doitnow=0;	
-			indextweak=pChan->dd.factor;
-			pChan->dd.factor = pChan->dd.x1 = pChan->dd.x0 = pChan->dd.y1 = pChan->dd.y0 = 0;
-			pChan->dd.timer=20000/MS_PER_FRAME;
-		}
-		// coarse lead adjustment if really far out of range
-		else if( pChan->dd.lead >= pChan->dd.framesize*(DDB_FRAMES_IN_BUFF-2) )
-		{
-			pChan->dd.factor = pChan->dd.x1 = pChan->dd.x0 = pChan->dd.y1 = pChan->dd.y0 = 0;
-			indextweak += (pChan->dd.framesize*5/4);
-		}
-		else if(pChan->dd.lead <= pChan->dd.framesize*2 )
-		{
-			pChan->dd.factor = pChan->dd.x1 = pChan->dd.x0 = pChan->dd.y1 = pChan->dd.y0 = 0;
-			indextweak -= (pChan->dd.framesize*5/4);
-		}
-	    #endif
-
-		#if 1
-		if(pChan->dd.timer>0)pChan->dd.timer--;
-		if(pChan->dd.timer==0 && abs(pChan->dd.factor)>=16)
-		{
-			indextweak=pChan->dd.factor;
-			pChan->dd.factor = pChan->dd.x1 = pChan->dd.x0 = pChan->dd.y1 = pChan->dd.y0 = 0;
-			pChan->dd.timer=20000/MS_PER_FRAME;
-		}
-		#endif
-
-		#if XPMR_DEBUG0 == 1
-		if(indextweak!=0)TRACEF(4,("%08i indextweak  %+4i  %+4i  %+5i  %5i  %5i  %5i  %+4i\n",pChan->dd.rxframecnt, indextweak, pChan->dd.err, accum, inputindex, pChan->dd.outputindex, pChan->dd.lead, pChan->dd.skew));
-		#endif
-
-		// set the output index based on lead and clock offset
-		pChan->dd.outputindex = (pChan->dd.outputindex + pChan->dd.framesize + indextweak)%pChan->dd.buffersize;
-	}
-}
-/*
-*/
-void dedrift_write(t_pmr_chan *pChan, i16 *src )
-{
-	void *vptr;
-
-	TRACEF(5,("dedrift_write()\n"));
-	vptr = pChan->dd.buff + pChan->dd.inputindex;
-	memcpy(vptr, src, pChan->dd.framesize*2);
-	pChan->dd.inputindex = (pChan->dd.inputindex + pChan->dd.framesize) % pChan->dd.buffersize;
-	pChan->dd.txframecnt++;
-	if(pChan->dd.initcnt!=0)pChan->dd.initcnt--;
-	pChan->dd.accum+=pChan->dd.framesize;
-}
-
-/* end of file */
diff --git a/channels/xpmr/xpmr.h b/channels/xpmr/xpmr.h
deleted file mode 100755
index 49f5148fa..000000000
--- a/channels/xpmr/xpmr.h
+++ /dev/null
@@ -1,951 +0,0 @@
-/*
- * xpmr.h - for Xelatec Private Mobile Radio Processes
- * 
- * All Rights Reserved. Copyright (C)2007, Xelatec, LLC
- * 
- * 20070808 1235 Steven Henke, W9SH, sph@xelatec.com
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- * 		 
- * This version may be optionally licenced under the GNU LGPL licence.
- *													
- * A license has been granted to Digium (via disclaimer) for the use of
- * this code.
- *
- */
-
-/*! \file
- *
- * \brief Private Land Mobile Radio Channel Voice and Signaling Processor
- *
- * \author Steven Henke, W9SH <sph@xelatec.com> Xelatec, LLC
- */
-
-#ifndef  XPMR_H
-#define  XPMR_H				1
-
-#define  XPMR_DEV   		0 			// when running in test mode
-
-#define  XPMR_TRACE_LEVEL	0
-
-#ifdef	 RADIO_RTX
-#define	 DTX_PROG			1			// rf transceiver module
-#define  XPMR_PPTP			0 			// parallel port test probe
-#else
-#define	 DTX_PROG			0
-#define  XPMR_PPTP			0 			
-#endif
-
-#if (DTX_PROG == 1) || 	XPMR_PPTP == 1
-#include <parapindriver.h>
-#endif
-
-#ifdef	CHAN_USBRADIO
-#define XPMR_DEBUG0		1
-#define XPMR_TRACE		1
-#define TRACEO(level,a) { if ( o->tracelevel >= level ) {printf a;} }
-#else
-#define XPMR_DEBUG0		1
-#define XPMR_TRACE		1
-#define TRACEO(level,a)
-#endif
-
-
-#define LSD_DFS			5
-#define LSD_DFD			1
-
-#if(XPMR_DEBUG0 == 1)
-#define XPMR_DEBUG_CHANS	16
-#define TSCOPE(a) {strace a;}
-#else
-#define XPMR_DEBUG_CHANS	0
-#define TSCOPE(a)
-#endif  
-
-#define	XPMR_TRACE_AMP		8192
-
-// TRACEM(3,TSYS_LSD,("pmr_lsdctl_exec() RX FRAME UNPROCESSED.\n"));
-#if(XPMR_TRACE == 1)
-#define TRACEX(a) {printf a;}
-#define TRACEXL(a) {printf("%s @ %u : ",__FILE__ ,__LINE__); printf a; }
-#define TRACEXT(a) {struct timeval hack; gettimeofday(&hack,NULL); printf("%ld.",hack.tv_sec%100000); printf("%i : ",(int)hack.tv_usec); printf a; }
-#define TRACEXR(a) {printf a;}
-#define TRACEC(level,a) {if(pChan->tracelevel>=level){printf("%08i ",pChan->frameCountRx);printf a;} }
-#define TRACEF(level,a) {if(pChan->tracelevel>=level){printf a;} }
-#define TRACEJ(level,a) {if(XPMR_TRACE_LEVEL>=level){printf a;} }
-#define TRACES(level,a) {if(mySps->parentChan->tracelevel >= level){printf a;} }
-#define TRACET(level,a) {if(pChan->tracelevel>=level){printf("%08i %02i",pChan->frameCountRx,pChan->rptnum);printf a;} }
-#define TRACEXR(a) {printf a;}
-#define TRACEM(level,sys,a) {if(pChan->tracelevel>=level || (pChan->tracesys[sys])){printf a;} }
-#else						  
-#define TRACEX(a)
-#define TRACEXL(a)
-#define TRACEXT(a)
-#define TRACEC(level,a)
-#define TRACEF(level,a)
-#define TRACEJ(level,a)
-#define TRACES(level,a)
-#define TRACET(level,a)
-#define TRACEXR(a)
-#define TRACEM(level,sys,a)
-#endif
-
-#define i8  	int8_t
-#define u8  	u_int8_t
-#define i16		int16_t
-#define u16 	u_int16_t
-#define i32		int32_t
-#define u32 	u_int32_t
-#define i64 	int64_t
-#define u64 	u_int64_t
-
-#define M_Q31			0x80000000		//
-#define M_Q30			0x40000000		//
-#define M_Q29			0x20000000		//
-#define M_Q28			0x10000000		//
-#define M_Q27			0x08000000		//
-#define M_Q26			0x04000000		//
-#define M_Q25			0x02000000		//			
-#define M_Q24			0x01000000		//
-#define M_Q23			0x00800000		//
-#define M_Q22			0x00400000		//					
-#define M_Q21			0x00200000		// undsoweiter  		
-#define M_Q20			0x00100000		// 1048576
-#define M_Q19			0x00080000		// 524288		   
-#define M_Q18			0x00040000		// 262144
-#define M_Q17           0x00020000		// 131072
-#define M_Q16           0x00010000		// 65536
-#define M_Q15           0x00008000		// 32768
-#define M_Q14           0x00004000		// 16384
-#define M_Q13           0x00002000		// 8182
-#define M_Q12           0x00001000		// 4096
-#define M_Q11           0x00000800		// 2048
-#define M_Q10           0x00000400		// 1024
-#define M_Q9            0x00000200		// 512
-#define M_Q8            0x00000100		// 256
-#define M_Q7            0x00000080		// 128
-#define M_Q6            0x00000040		// 64
-#define M_Q5            0x00000020		// 32
-#define M_Q4            0x00000010		// 16
-#define M_Q3            0x00000008		// 16
-#define M_Q2            0x00000004		// 16
-#define M_Q1            0x00000002		// 16
-#define M_Q0            0x00000001		// 16
-
-#define RADIANS_PER_CYCLE		(2*M_PI)
-
-#define SAMPLE_RATE_INPUT       48000
-#define SAMPLE_RATE_NETWORK     8000
-
-#define SAMPLES_PER_BLOCK       160
-#define MS_PER_FRAME            20
-#define SAMPLES_PER_MS          8
-
-#define CTCSS_NULL              -1
-#define CTCSS_RXONLY            -2
-#define CTCSS_NUM_CODES			38 			// 0 - 37
-#define CTCSS_SCOUNT_MUL		100
-#define CTCSS_INTEGRATE	  		3932       // 32767*.120 // 120/1000  // 0.120
-#define CTCSS_INPUT_LIMIT	  	1000
-#define CTCSS_DETECT_POINT	  	1989
-#define CTCSS_HYSTERSIS	  	    200
-
-#define CTCSS_TURN_OFF_TIME		160			// ms
-#define CTCSS_TURN_OFF_SHIFT    240			// degrees
-#define TOC_NOTONE_TIME			600			// ms
-
-#define	DDB_FRAME_SIZE			160		   	// clock de-drift defaults
-#define DDB_FRAMES_IN_BUFF		8
-#define DDB_ERR_MODULUS 		10000
-
-#define DCS_TURN_OFF_TIME       180
-
-#define	NUM_TXLSD_FRAMEBUFFERS	4
-
-#define CHAN_TXSTATE_IDLE		0
-#define CHAN_TXSTATE_ACTIVE		1
-#define CHAN_TXSTATE_TOC		2
-#define CHAN_TXSTATE_HANGING    3
-#define CHAN_TXSTATE_FINISHING  4
-#define CHAN_TXSTATE_COMPLETE	5
-#define CHAN_TXSTATE_USURPED	9
-
-#define SMODE_NULL				0
-#define SMODE_CARRIER			1
-#define SMODE_CTCSS				2
-#define SMODE_DCS       		3
-#define SMODE_LSD				4
-#define SMODE_MPT				5
-#define SMODE_DST				6
-#define SMODE_P25				7
-#define SMODE_MDC				8
-
-
-#define SPS_OPT_START			1
-#define SPS_OPT_STOP			2
-#define SPS_OPT_TURNOFF         3
-#define SPS_OPT_STOPNOW			4
-
-#define SPS_STAT_STOPPED		0
-#define SPS_STAT_STARTING		1
-#define SPS_STAT_RUNNING		2
-#define SPS_STAT_HALTING		3
-
- 
-#define PP_BIT_TEST		6
-#define PP_REG_LEN		32
-#define PP_BIT_TIME		100000
-					  	
-#define DTX_CLK 	LP_PIN02
-#define DTX_DATA 	LP_PIN03
-#define DTX_ENABLE 	LP_PIN04
-#define DTX_TX 	    LP_PIN05		// only used on older mods
-#define DTX_TXPWR 	LP_PIN06		// not used
-#define DTX_TP1 	LP_PIN07		// not used
-#define DTX_TP2 	LP_PIN08		// not used
-
-#define BIN_PROG_0 	LP_PIN06
-#define BIN_PROG_1 	LP_PIN07
-#define BIN_PROG_2 	LP_PIN08
-#define BIN_PROG_3 	LP_PIN09 
-		 
-#ifndef CHAN_USBRADIO  
-enum {RX_AUDIO_NONE,RX_AUDIO_SPEAKER,RX_AUDIO_FLAT};
-enum {TX_AUDIO_NONE,TX_AUDIO_FLAT,TX_AUDIO_FILTERED,TX_AUDIO_PROC};
-enum {CD_IGNORE,CD_XPMR_NOISE,CD_XPMR_VOX,CD_HID,CD_HID_INVERT};
-enum {SD_IGNORE,SD_HID,SD_HID_INVERT,SD_XPMR};    				 // no,external,externalinvert,software
-enum {RX_KEY_CARRIER,RX_KEY_CARRIER_CODE};
-enum {TX_OUT_OFF,TX_OUT_VOICE,TX_OUT_LSD,TX_OUT_COMPOSITE,TX_OUT_AUX};
-enum {TOC_NONE,TOC_PHASE,TOC_NOTONE};
-#endif
-
-enum dbg_pts {
- 
-RX_INPUT,	
-RX_NOISE_AMP, 
-RX_NOISE_TRIG,
-
-RX_CTCSS_LPF,
-RX_CTCSS_CENTER,
-RX_CTCSS_NRZ,
-RX_CTCSS_CLK,
-RX_CTCSS_P0,  
-RX_CTCSS_P1,
-RX_CTCSS_ACCUM,
-RX_CTCSS_DVDT,
-RX_CTCSS_DECODE,
-
-RX_DCS_CENTER,
-RX_DCS_DEC,
-RX_DCS_DIN,
-RX_DCS_CLK,
-RX_DCS_DAT,
-
-RX_LSD_LPF,
-RX_LSD_CLK,
-RX_LSD_DAT,
-RX_LSD_DEC,
-
-RX_LSD_CENTER,
-RX_LSD_SYNC,  
-RX_LSD_STATE,
-RX_LSD_ERR,
-RX_LSD_INTE,
-
-RX_SMODE,
-
-TX_PTT_IN,
-TX_PTT_OUT,
-
-TX_DEDRIFT_LEAD,
-TX_DEDRIFT_ERR,
-TX_DEDRIFT_FACTOR,
-TX_DEDRIFT_DRIFT,
-TX_DEDRIFT_TWIDDLE,
-
-TX_CTCSS_GEN,
-
-TX_SIGGEN_0,
-
-TX_DCS_CLK,
-TX_DCS_DAT,
-TX_DCS_LPF,
-
-TX_LSD_CLK,
-TX_LSD_DAT,
-TX_LSD_GEN,  	
-TX_LSD_LPF,
-
-TX_NET_INT,
-TX_VOX_HPF,
-TX_VOX_LIM,
-
-TX_VOX_LPF,
-
-TX_OUT_A,
-TX_OUT_B,
-
-NUM_DEBUG_PTS  
-};
-
-typedef struct
-{
-	i16 mode;
-	i16	point[NUM_DEBUG_PTS];
-	i16 trace[16];
-	i16 scale[16];
-	i16 offset[16];
-	i16 buffer[16 * SAMPLES_PER_BLOCK];  // allocate for rx and tx
-	i16 *source[16];
-} t_sdbg;
-
-typedef struct
-{
-	i16 lock;
-	i16 option;					// 1 = data in, 0 = data out
-	i16 debug;
-	i16 debugcnt;
-	i32 rxframecnt;
-	i32 txframecnt;
-
-	i32 skew;
-
-	i16 frames;
-	i16 framesize;
-	i16 buffersize;
-
-	i32 timer;
-	
-	i32 x0,x1,y0,y1;
-
-	i16 inputindex;
-	i16 outputindex;
-	i16 lead;
-	i16 err;
-	i16 accum;
-
-	i16 *ptr;					// source or destination
-	i16	*buff;
-	
-	i16 inputcnt;
-	i16 initcnt;
-
-	i32 factor;
-	i32 drift;
-	i32 modulus;
-	i32	z1;
-	struct {
-		unsigned rxlock:1;
-		unsigned txlock:1;
-		unsigned twiddle:1;
-		unsigned doitnow:1;
-	}b;
-}
-t_dedrift;
-
-/*
-	one structure for each ctcss tone to decode 
-*/
-typedef struct
-{
-	i16 counter;			// counter to next sample
-	i16 counterFactor;		// full divisor used to increment counter
-	i16 binFactor;
-	i16 fudgeFactor;
-	i16 peak;				// peak amplitude now	maw sph now
-	i16 enabled;
-	i16 state;				// dead, running, error				 
-	i16 zIndex;				// z bucket index
-	i16 z[4];	  			 
-	i16 zi;
-	i16 dvu;
-	i16 dvd;
-	i16 zd;
-	i16 setpt;
-	i16 hyst;
-	i16 decode;
-	i16 diffpeak;
-	i16 debug;				 
-
-	#if XPMR_DEBUG0 == 1
-	i16 lasttv0;
-	i16 lasttv1;
-	i16 lasttv2;
-	i16 lasttv3;
-
-	i16 *pDebug0;			// pointer to debug output
-	i16 *pDebug1;			// pointer to debug output
-	i16 *pDebug2;			// pointer to debug output
-	i16 *pDebug3;			// pointer to debug output
-	#endif
-
-} t_tdet;
-
-typedef struct
-{
-	i16 enabled;						// if 0 none, 0xFFFF all tones, or single tone
-	i16 *input;							// source data
-	i16 clamplitude;
-	i16 center;
-	i16 decode;		  					// current ctcss decode index
-	i32 BlankingTimer;
-	u32 TurnOffTimer;
-	i16 gain;
-	i16 limit;
-	i16 debugIndex;
-	i16 *pDebug0;
-	i16 *pDebug1;
-	i16 *pDebug2;
-	i16 *pDebug3;
-	i16 testIndex;
-	i16 multiFreq;
-	i8 relax;
-	t_tdet tdet[CTCSS_NUM_CODES];
-
-	i8 		numrxcodes;
-	i16 	rxCtcssMap[CTCSS_NUM_CODES];
-	char    *rxctcss[CTCSS_NUM_CODES];		// pointers to each tone in string above
-	char    *txctcss[CTCSS_NUM_CODES];
-
-	i32		txctcssdefault_index;
-	float 	txctcssdefault_value;
-
-	struct{
-		unsigned valid:1;
-	}b;
-} t_dec_ctcss;
-
-/*
-	Low Speed Data
-*/
-/* 
-	general purpose pmr signal processing element 
-*/
-
-struct t_pmr_chan;
-
-typedef struct t_pmr_sps
-{
-	i16  index;		  	// unique to each instance
-
-	i16  enabled;		// enabled/disabled
-
-
-	struct t_pmr_chan *parentChan;
-	
-	i16  *source;		// source buffer
-	i16  *sourceB;		// source buffer B
-	i16  *sink;			// sink buffer
-
-	i16  numChanOut;	// allows output direct to interleaved buffer
-	i16  selChanOut;
-
-	i32  ticks;			
-	i32  timer;
-	i32  count;
-
-	void *buff;			// this structure's internal buffer
-
-	i16  *debugBuff0;	// debug buffer
-	i16  *debugBuff1;	// debug buffer
-	i16  *debugBuff2;	// debug buffer
-	i16  *debugBuff3;	// debug buffer
-
-	i16  nSamples;		// number of samples in the buffer
-
-	u32	 buffSize;		// buffer maximum index
-	u32  buffInIndex;	// index to current input point
-	u32  buffOutIndex;	// index to current output point
-	u32  buffLead;		// lead of input over output through cb
-
-	i16  decimate;		// decimation or interpolation factor (could be put in coef's)
-	i16  interpolate;
-	i16	 decimator;		// like the state this must be saved between calls (could be put in x's)
-
-	u32  sampleRate;    // in Hz for elements in this structure
-	u32  freq;			// in 0.1 Hz
-
-	i16  measPeak;		// do measure Peak
-	i16  amax;			// buffer amplitude maximum
-	i16  amin;			// buffer amplitude minimum
-	i16  apeak;			// buffer amplitude peak value (peak to peak)/2
-	i16  setpt;			// amplitude set point for amplitude comparator
-	i16  hyst;			// hysterysis for amplitude comparator
-	i16  compOut;		// amplitude comparator output
-
-	i32  discounteru;	// amplitude detector integrator discharge counter upper
-	i32  discounterl;	// amplitude detector integrator discharge counter lower
-	i32  discfactor;	// amplitude detector integrator discharge factor
-
-	i16  err;			// error condition
-	i16  option;		// option / request zero
-	i16  state;         // stopped, start, stopped assumes zero'd
-	
-	i16  pending;
-
-	struct {
-		unsigned hit:1;
-		unsigned hitlast:1;
-		unsigned hita:1;
-		unsigned hitb:1;
-		unsigned bithit:1;
-		unsigned now:1;
-		unsigned next:1;
-		unsigned prev:1;
-		unsigned clock:1;
-		unsigned hold:1;
-		unsigned opt1:1;
-		unsigned opt2:1;
-		unsigned polarity:1;
-		unsigned dotting:1;
-		unsigned lastbitpending:1;
-		unsigned outzero:1;
-		unsigned settling:1;
-		unsigned syncing:1;
-	}b;
-
-	i16  cleared;		// output buffer cleared
-
-	i16  delay;
-	i16  decode;
-
-	i32  inputGain;	  	// apply to input data	 ? in Q7.8 format
-	i32  inputGainB;	// apply to input data	 ? in Q7.8 format
-	i32  outputGain;	// apply to output data  ? in Q7.8 format
-	i16  mixOut;
-	i16  monoOut;
-
-	i16  filterType;	// iir, fir, 1, 2, 3, 4 ...
-
-	i16 (*sigProc)(struct t_pmr_sps *sps);	// function to call
-
-	i32	 calcAdjust;	// final adjustment
-	i16	 nx;	 		// number of x history elements
-	i16  ncoef;			// number of coefficients
-	i16  size_x;		// size of each x history element
-	i16  size_coef;		// size of each coefficient
-	void  *x;			// history registers
-	void  *x2;			// history registers, 2nd bank 
-	void  *coef;		// coefficients
-	void  *coef2;		// coefficients 2
-
-	void  *nextSps;		// next Sps function
-
-} t_pmr_sps;
-
-
-struct t_dec_dcs;
-struct t_lsd_control;
-struct t_decLsd;;	
-struct t_encLsd;
-
-/*
-	pmr channel
-*/
-typedef struct	t_pmr_chan
-{
-	i16 index;				// which one
-	i16 devicenum;			// belongs to
-
-	char *name;
-
-	i16 enabled;			// enabled/disabled
-	i16 status;				// ok, error, busy, idle, initializing
-	
-	i16  tracelevel;
-	i16  tracetype;
-	u32  tracemask;
-
-	i16 nSamplesRx;			// max frame size
-	i16 nSamplesTx;
-
-	i32 inputSampleRate;	// in S/s  48000
-	i32 baseSampleRate;		// in S/s   8000 
-
-	i16 inputGain;
-	i16 inputOffset;
-
-	i32  ticks;				// time ticks
-	u32  frameCountRx;		// number processed
-	u32  frameCountTx;
-
-	i8   txframelock;
-
-	i32  txHangTime;
-	i32  txHangTimer;
-	i32  txTurnOff;
-	i16  txBufferClear;
-
-	u32 txfreq;
-	u32 rxfreq;
-	i8  txpower;
-
-	i32 txsettletime;		// in samples
-	i32 txsettletimer;
-
-	i16 rxDC;			    // average DC value of input
-	i16 rxSqSet;			// carrier squelch threshold
-	i16 rxSqHyst;			// carrier squelch hysterysis
-	i16 rxRssi;				// current Rssi level
-	i16 rxQuality;			// signal quality metric
-	i16 rxCarrierDetect;    // carrier detect
-	i16 rxCdType;
-	i16 rxSqVoxAdj;
-	i16 rxExtCarrierDetect; 
-	i32 inputBlanking;  	// Tx pulse eliminator
-
-	i16 rxDemod;   		// see enum
-	i16 txMod;			//
-
-	i16 rxNoiseSquelchEnable;
-	i16 rxHpfEnable;
-	i16 rxDeEmpEnable;
-	i16 rxCenterSlicerEnable;
-	i16 rxCtcssDecodeEnable;
-	i16 rxDcsDecodeEnable;
-	i16 rxDelayLineEnable;
-
-	i16 txHpfEnable;
-	i16 txLimiterEnable;
-	i16 txPreEmpEnable;
-	i16 txLpfEnable;
-
-	char radioDuplex;
-
-	char    *pStr;
-
-	// 		start channel signaling codes source
-	char 	*pRxCodeSrc;					// source
-	char 	*pTxCodeSrc;					// source
-	char 	*pTxCodeDefault;				// source
-	// 		end channel signaling codes source
-
-	// 		start signaling code info derived from source
-	i16  	numrxcodes;
-	i16  	numtxcodes;
-	char 	*pRxCodeStr;					// copied and cut up
-	char 	**pRxCode;						// pointers to subs
-	char 	*pTxCodeStr;					 
-	char 	**pTxCode;
-
-	char 	txctcssdefault[16];				// codes from higher level
-
-	char	*rxctcssfreqs; 					// rest are derived from this 
-	char    *txctcssfreqs;
-	
-	char    numrxctcssfreqs;
-	char    numtxctcssfreqs;
-
-	char    *rxctcss[CTCSS_NUM_CODES];		// pointers to each tone in string above
-	char    *txctcss[CTCSS_NUM_CODES];
-
-	i16 	rxCtcssMap[CTCSS_NUM_CODES];
-
-	i8		txcodedefaultsmode;
-	i16		txctcssdefault_index;
-	float 	txctcssdefault_value;
-
-	char	txctcssfreq[32];				// encode now
-	char    rxctcssfreq[32];				// decode now
-	// 		end most of signaling code info derived from source
-
-	struct t_lsd_control	*pLsdCtl;
-
-	i16  rptnum;
-	i16  area;
-	char *ukey;
-	u32  idleinterval;
-	char turnoffs;
-
-	char pplock;
-
-	t_dedrift	dd;
-
-	i16 dummy;
-
-	i32 txScramFreq;
-	i32 rxScramFreq;
-
-	i16 gainVoice;
-	i16 gainSubAudible;
-
-	i16 txMixA;				// Off, Ctcss, Voice, Composite
-	i16 txMixB;				// Off, Ctcss, Voice, Composite
-	
-	i16 rxMuting;
-
-	i16 rxCpuSaver;
-	i16 txCpuSaver;
-
-	i8	rxSqMode;			// 0 open, 1 carrier, 2 coded
-
-	i8	cdMethod;
-
-	i16	rxSquelchPoint;
-
-	i16 rxCarrierPoint;
-	i16 rxCarrierHyst;
-	
-	i16 txCtcssTocShift;
-	i16 txCtcssTocTime;
-	i8	txTocType;
-
-	i16 smode;	  							// ctcss, dcs, lsd
-	i16 smodecode;
-	i16 smodewas;	  						// ctcss, dcs, lsd
-	i32 smodetimer;	  						// in ms
-	i32 smodetime;							// to set in ms
-
-	t_dec_ctcss			*rxCtcss;
-	struct t_dec_dcs	*decDcs;
-	struct t_decLsd 	*decLsd;		 				
-	struct t_encLsd		*pLsdEnc;
-
-	i16 clamplitudeDcs;
-	i16 centerDcs;
-	u32 dcsBlankingTimer;
-	i16 dcsDecode;							// current dcs decode value
-
-	i16 clamplitudeLsd;
-	i16 centerLsd;
-
-
-	i16 txPttIn;	 		// from external request
-	i16 txPttOut;			// to radio hardware
-	i16 txPttHid;
-
-	i16 bandwidth;			// wide/narrow
-	i16 txCompand;			// type
-	i16 rxCompand;			// 
-	
-	i16 txEqRight;			// muted, flat, pre-emp limited filtered
-	i16 txEqLeft;
-
-	i16 txPotRight;			// 
-	i16 txPotLeft;			//
-
-	i16 rxPotRight;			// 
-	i16 rxPotLeft;			//
-
-	i16 function;
-
-	i16 txState;				// off,settling,on,hangtime,turnoff
-
-	i16 spsIndex;
-
-	t_pmr_sps *spsMeasure;		// measurement block
-
-	t_pmr_sps *spsRx;			// 1st signal processing struct
-	t_pmr_sps *spsRxLsd;
-	t_pmr_sps *spsRxLsdNrz;
-	t_pmr_sps *spsRxDeEmp;
-	t_pmr_sps *spsRxHpf;
-	t_pmr_sps *spsRxVox;
-	t_pmr_sps *spsDelayLine;	// Last signal processing struct
-	t_pmr_sps *spsRxOut;		// Last signal processing struct
-
-	t_pmr_sps *spsTx;			// 1st  signal processing struct
-	
-	t_pmr_sps *spsTxOutA;		// Last signal processing struct
-	t_pmr_sps *spsTxOutB;		// Last signal processing struct
-
-	t_pmr_sps *spsSigGen0;		// ctcss
-	t_pmr_sps *spsSigGen1;		// test and other tones
-	t_pmr_sps *spsLsdGen;
-	t_pmr_sps *spsTxLsdLpf;
-
-	// tune tweaks
-
-	i32 rxVoxTimer;				// Vox Hang Timer
-
-	i16	*prxSquelchAdjust;
-
-	// i16	*prxNoiseMeasure;	// for autotune
-	// i32	*prxNoiseAdjust;
-
-	i16	*prxVoiceMeasure;
-	i32	*prxVoiceAdjust;	
-	
-	i16	*prxCtcssMeasure;
-	i32	*prxCtcssAdjust;		 
-	
-	i16	*ptxVoiceAdjust;		// from calling application
-	i32	*ptxCtcssAdjust;		// from calling application
-
-	i32	*ptxLimiterAdjust;		// from calling application
-
-	struct {
-		unsigned pmrNoiseSquelch:1;
-		unsigned rxHpf:1;
-		unsigned txHpf:1;
-		unsigned txLpf:1;
-		unsigned rxDeEmphasis:1;
-		unsigned txPreEmphasis:1;
-		unsigned startSpecialTone:1;
-		unsigned stopSpecialTone:1;
-		unsigned doingSpecialTone:1;
-		unsigned extCarrierDetect:1;
-		unsigned txCapture:1;
-		unsigned rxCapture:1;
-		unsigned reprog:1;
-		unsigned radioactive:1;
-		unsigned rxplmon:1;
-		unsigned remoted:1;
-		unsigned loopback:1;
-		unsigned rxpolarity:1;
-		unsigned txpolarity:1;
-		unsigned dcsrxpolarity:1;
-		unsigned dcstxpolarity:1;
-		unsigned lsdrxpolarity:1;
-		unsigned lsdtxpolarity:1;
-		unsigned txsettling:1;
-		unsigned smodeturnoff:1;
-
-		unsigned ctcssRxEnable:1;
-		unsigned ctcssTxEnable:1;
-		unsigned dcsRxEnable:1;
-		unsigned dcsTxEnable:1;
-		unsigned lmrRxEnable:1;
-		unsigned lmrTxEnable:1;
-		unsigned mdcRxEnable:1;
-		unsigned mdcTxEnable:1;
-		unsigned dstRxEnable:1;
-		unsigned dstTxEnable:1;
-		unsigned p25RxEnable:1;
-		unsigned p25TxEnable:1;
-		unsigned ax25Enable:1;
-
-		unsigned txCtcssInhibit:1;
-
-		unsigned rxkeyed:1;
-		unsigned rxhalted:1;
-		unsigned txhalted:1;
-		unsigned pptp_p1:1;
-		unsigned pptp_p2:1;
-		unsigned tuning:1;
-		unsigned pttwas:1;
-	}b;
-
-	i16 *pRxDemod;				// buffers
-	i16 *pRxBase;	 			// decimated lpf input
-	i16 *pRxNoise;   
-	i16 *pRxLsd;				// subaudible only 
-	i16 *pRxHpf;				// subaudible removed
-	i16 *pRxDeEmp;        		// EIA Audio
-	i16 *pRxSpeaker;        	// EIA Audio
-	i16 *pRxDcTrack;			// DC Restored LSD
-	i16 *pRxLsdLimit;         	// LSD Limited
-	i16 *pRxCtcss;				//
-	i16 *pRxSquelch;
-	i16 *prxVoxMeas;				
-	i16 *prxMeasure;
-
-	i16 *pTxInput;				// input data
-	i16 *pTxBase;				// input data
-	i16 *pTxHpf;
-	i16 *pTxPreEmp;
-	i16 *pTxLimiter;
-	i16 *pTxLsd;
-	i16 *pTxLsdLpf;
-	i16 *pTxComposite;
-	i16 *pTxMod;			// upsampled, low pass filtered
-	
-	i16 *pTxOut;			// 
-
-	i16	*pSigGen0;
-	i16	*pSigGen1;
-
-	i16 *pAlt0;
-	i16 *pAlt1;
-
-	i16 *pNull;
-
-	#if XPMR_DEBUG0 == 1
-
-	i16 *pRxLsdCen;
-
-	i16 *pTstTxOut;
-
-	i16 *prxDebug;			// consolidated debug buffer
-	i16 *ptxDebug;			// consolidated debug buffer
-
-	i16 *prxDebug0;
-	i16 *prxDebug1;
-	i16 *prxDebug2;
-	i16 *prxDebug3;
-
-	i16 *ptxDebug0;
-	i16 *ptxDebug1;
-	i16 *ptxDebug2;
-	i16 *ptxDebug3;
-
-	#endif
-
-	i16 numDebugChannels;
-
-	t_sdbg	*sdbg;
-
-} t_pmr_chan;
-
-/*
-	function prototype declarations
-*/
-void 		strace(i16 point, t_sdbg *sdbg, i16 index, i16 value);
-void 		strace2(t_sdbg *sdbg);
-
-static i16	TxTestTone(t_pmr_chan *pChan, i16 function);
-t_pmr_chan	*createPmrChannel(t_pmr_chan *tChan, i16 numSamples);
-t_pmr_sps 	*createPmrSps(t_pmr_chan *pChan);
-i16			destroyPmrChannel(t_pmr_chan *pChan);
-i16			destroyPmrSps(t_pmr_sps  *pSps);
-i16 		pmr_rx_frontend(t_pmr_sps *mySps);
-i16 		pmr_gp_fir(t_pmr_sps *mySps);
-i16 		pmr_gp_iir(t_pmr_sps *mySps);
-i16 		gp_inte_00(t_pmr_sps *mySps);
-i16 		gp_diff(t_pmr_sps *mySps);
-i16 		CenterSlicer(t_pmr_sps *mySps);
-i16 		ctcss_detect(t_pmr_chan *pmrChan);
-i16 		SoftLimiter(t_pmr_sps *mySps);
-i16			SigGen(t_pmr_sps *mySps);
-i16 		pmrMixer(t_pmr_sps *mySps);
-i16 		DelayLine(t_pmr_sps *mySps);
-
-i16			PmrRx(t_pmr_chan *PmrChan, i16 *input, i16 *outputrx, i16 *outputtx );
-i16			PmrTx(t_pmr_chan *PmrChan, i16 *input);
-
-i16 		string_parse(char *src, char **dest, char ***ptrs);
-i16 		code_string_parse(t_pmr_chan *pChan);
-
-i16 		CtcssFreqIndex(float freq);
-i16 		MeasureBlock(t_pmr_sps *mySps);
-
-void		dedrift			(t_pmr_chan *pChan);
-void 		dedrift_write	(t_pmr_chan *pChan, i16 *src);
-
-void		ppspiout	(u32 spidata);
-void		progdtx		(t_pmr_chan *pChan);
-void		ppbinout	(u8 chan);
-
-#if XPMR_PPTP == 1
-void		pptp_init 		(void);
-void		pptp_write		(i16 bit, i16 state);
-#endif
-
-#endif /* ! XPMR_H */
-
-/* end of file */
-
-
-
diff --git a/channels/xpmr/xpmr_coef.h b/channels/xpmr/xpmr_coef.h
deleted file mode 100755
index 84254e884..000000000
--- a/channels/xpmr/xpmr_coef.h
+++ /dev/null
@@ -1,667 +0,0 @@
-/*
- * xpmr_coef.h - for Xelatec Private Mobile Radio Processes
- * 
- * All Rights Reserved. Copyright (C)2007, Xelatec, LLC
- * 
- * 20070808 1235 Steven Henke, W9SH, sph@xelatec.com
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- * 		 
- * This version may be optionally licenced under the GNU LGPL licence.
- *
- * A license has been granted to Digium (via disclaimer) for the use of
- * this code.
- *
- * Some filter coeficients via 'WinFilter' http://www.winfilter.20m.com.
- *
- */
-
-/*! \file
- *
- * \brief Private Land Mobile Radio Channel Voice and Signaling Processor
- *
- * \author Steven Henke, W9SH <sph@xelatec.com> Xelatec, LLC
- */
-
-#ifndef XPMR_COEF_H
-#define XMPR_COEF_H 	1
-
-// frequencies in 0.1 Hz
-static const u32 dtmf_row[] =
-{
-	6970,  7700,  8520,  9410
-};
-static const u32 dtmf_col[] =
-{
-	12090, 13360, 14770, 16330
-};
-
-
-#define CTCSS_COEF_INT		120
-#define CTCSS_SAMPLE_RATE   8000
-#define TDIV(x) ((CTCSS_SAMPLE_RATE*1000/x)+5)/10
-
-#if 0
-static i32 coef_ctcss[4][5]=
-{
-	// freq, divisor, integrator, filter
-	{770,TDIV(770),CTCSS_COEF_INT,0,0},
-	{1000,TDIV(1000),CTCSS_COEF_INT,0,0},
-	{1035,TDIV(1035),CTCSS_COEF_INT,0,0},
-	{0,0,0,0}
-};
-#endif
-
-static i16 coef_ctcss_div[]=
-{
-2985,    // 00   067.0
-2782,    // 01   071.9
-2688,    // 02   074.4
-2597,    // 03   077.0
-2509,    // 04   079.7
-2424,    // 05   082.5
-2342,    // 06   085.4
-2260,    // 07   088.5
-2186,    // 08   091.5
-2110,    // 09   094.8
-2053,    // 10   097.4
-2000,    // 11   100.0
-1932,    // 12   103.5
-1866,    // 13   107.2
-1803,    // 14   110.9
-1742,    // 15   114.8
-1684,    // 16   118.8
-1626,    // 17   123.0
-1571,    // 18   127.3
-1517,    // 19   131.8
-1465,    // 20   136.5
-1415,    // 21   141.3
-1368,    // 22   146.2
-1321,    // 23   151.4
-1276,    // 24   156.7
-1233,    // 25   162.2
-1191,    // 26   167.9
-1151,    // 27   173.8
-1112,    // 28   179.9
-1074,    // 29   186.2
-1037,    // 30   192.8
-983,    // 31   203.5
-949,    // 32   210.7
-917,    // 33   218.1
-886,    // 34   225.7
-856,    // 35   233.6
-827,    // 36   241.8
-799     // 37   250.3
-};
-
-static float freq_ctcss[]=
-{
-067.0,    // 00   
-071.9,    // 01   
-074.4,    // 02   
-077.0,    // 03   
-079.7,    // 04   
-082.5,    // 05   
-085.4,    // 06   
-088.5,    // 07   
-091.5,    // 08   
-094.8,    // 09   
-097.4,    // 10   
-100.0,    // 11   
-103.5,    // 12   
-107.2,    // 13   
-110.9,    // 14   
-114.8,    // 15   
-118.8,    // 16   
-123.0,    // 17   
-127.3,    // 18   
-131.8,    // 19   
-136.5,    // 20   
-141.3,    // 21   
-146.2,    // 22   
-151.4,    // 23   
-156.7,    // 24   
-162.2,    // 25   
-167.9,    // 26   
-173.8,    // 27   
-179.9,    // 28   
-186.2,    // 29   
-192.8,    // 30   
-203.5,    // 31  
-210.7 ,    // 32  
-218.1 ,    // 33  
-225.7 ,    // 34  
-233.6 ,    // 35  
-241.8 ,    // 36  
-250.3      // 37  
-};
-
-/*
-	noise squelch carrier detect filter
-*/
-static const int16_t taps_fir_bpf_noise_1 = 66;
-static const int32_t gain_fir_bpf_noise_1 = 65536;
-static const int16_t coef_fir_bpf_noise_1[] = { 
-      139,
-     -182,
-     -269,
-      -66,
-       56,
-       59,
-      250,
-      395,
-      -80,
-     -775,
-     -557,
-      437,
-      779,
-      210,
-      -17,
-      123,
-     -692,
-    -1664,
-     -256,
-     2495,
-     2237,
-    -1018,
-    -2133,
-     -478,
-    -1134,
-    -2711,
-     2642,
-    10453,
-     4010,
-    -14385,
-    -16488,
-     6954,
-    23030,
-     6954,
-    -16488,
-    -14385,
-     4010,
-    10453,
-     2642,
-    -2711,
-    -1134,
-     -478,
-    -2133,
-    -1018,
-     2237,
-     2495,
-     -256,
-    -1664,
-     -692,
-      123,
-      -17,
-      210,
-      779,
-      437,
-     -557,
-     -775,
-      -80,
-      395,
-      250,
-       59,
-       56,
-      -66,
-     -269,
-     -182,
-      139,
-      257
-};
-/*
-	tbd
-*/
-static const int16_t taps_fir_lpf_3K_1 = 66;
-static const int32_t gain_fir_lpf_3K_1 = 131072;
-static const int16_t coef_fir_lpf_3K_1[] = { 
-      259,
-       58,
-     -185,
-     -437,
-     -654,
-     -793,
-     -815,
-     -696,
-     -434,
-      -48,
-      414,
-      886,
-     1284,
-     1523,
-     1529,
-     1254,
-      691,
-     -117,
-    -1078,
-    -2049,
-    -2854,
-    -3303,
-    -3220,
-    -2472,
-     -995,
-     1187,
-     3952,
-     7086,
-    10300,
-    13270,
-    15672,
-    17236,
-    17778,
-    17236,
-    15672,
-    13270,
-    10300,
-     7086,
-     3952,
-     1187,
-     -995,
-    -2472,
-    -3220,
-    -3303,
-    -2854,
-    -2049,
-    -1078,
-     -117,
-      691,
-     1254,
-     1529,
-     1523,
-     1284,
-      886,
-      414,
-      -48,
-     -434,
-     -696,
-     -815,
-     -793,
-     -654,
-     -437,
-     -185,
-       58,
-      259,
-      393
-};
-
-/**************************************************************
-Filter type: Low Pass
-Filter model: Butterworth
-Filter order: 9
-Sampling Frequency: 8 KHz
-Cut Frequency: 0.250000 KHz
-Coefficents Quantization: 16-bit
-***************************************************************/
-static const int16_t taps_fir_lpf_250_11_64 = 64;
-static const int32_t gain_fir_lpf_250_11_64 = 262144;
-static const int16_t coef_fir_lpf_250_11_64[] = 
-{
-      366,
-       -3,
-     -418,
-     -865,
-    -1328,
-    -1788,
-    -2223,
-    -2609,
-    -2922,
-    -3138,
-    -3232,
-    -3181,
-    -2967,
-    -2573,
-    -1988,
-    -1206,
-     -228,
-      937,
-     2277,
-     3767,
-     5379,
-     7077,
-     8821,
-    10564,
-    12259,
-    13855,
-    15305,
-    16563,
-    17588,
-    18346,
-    18812,
-    18968,
-    18812,
-    18346,
-    17588,
-    16563,
-    15305,
-    13855,
-    12259,
-    10564,
-     8821,
-     7077,
-     5379,
-     3767,
-     2277,
-      937,
-     -228,
-    -1206,
-    -1988,
-    -2573,
-    -2967,
-    -3181,
-    -3232,
-    -3138,
-    -2922,
-    -2609,
-    -2223,
-    -1788,
-    -1328,
-     -865,
-     -418,
-       -3,
-      366,
-      680
-};
-
-// de-emphasis integrator 300 Hz with 8KS/s
-// a0, b1
-static const int16_t taps_int_lpf_300_1_2 = 2;
-static const int32_t gain_int_lpf_300_1_2 = 8182;
-static const int16_t coef_int_lpf_300_1_2[]={
-6878,
-25889
-};
-
-// pre-emphasis differentiator 4000 Hz with 8KS/s
-// a0,a1,b0,
-static const int16_t taps_int_hpf_4000_1_2 = 2;
-//static const int32_t gain_int_hpf_4000_1_2 = 16384;  // per calculations
-static const int32_t gain_int_hpf_4000_1_2 = 13404; // hand tweaked for unity gain at 1KHz
-static const int16_t coef_int_hpf_4000_1_2[]={
-17610,
--17610,
-2454
-};
-
-
-
-
-/*
-	ctcss decode filter
-*/
-/**************************************************************
-Filter type: Low Pass
-Filter model: Butterworth
-Filter order: 9
-Sampling Frequency: 8 KHz
-Cut Frequency: 0.250000 KHz
-Coefficents Quantization: 16-bit
-***************************************************************/
-static const int16_t taps_fir_lpf_250_9_66 = 66;
-static const int32_t gain_fir_lpf_250_9_66 = 262144;
-static const int16_t coef_fir_lpf_250_9_66[] = 
-{ 
-  676,
-  364,
-   -3,
- -415,
- -860,
--1320,
--1777,
--2209,
--2593,
--2904,
--3119,
--3212,
--3162,
--2949,
--2557,
--1975,
--1198,
- -226,
-  932,
- 2263,
- 3744,
- 5346,
- 7034,
- 8767,
-10499,
-12184,
-13770,
-15211,
-16462,
-17480,
-18234,
-18696,
-18852,
-18696,
-18234,
-17480,
-16462,
-15211,
-13770,
-12184,
-10499,
- 8767,
- 7034,
- 5346,
- 3744,
- 2263,
-  932,
- -226,
--1198,
--1975,
--2557,
--2949,
--3162,
--3212,
--3119,
--2904,
--2593,
--2209,
--1777,
--1320,
- -860,
- -415,
-   -3,
-  364,
-  676,
-  927
-};
-/* *************************************************************
-Filter type: Low Pass
-Filter model: Butterworth
-Filter order: 9
-Sampling Frequency: 8 KHz
-Cut Frequency: 0.215 KHz
-Coefficents Quantization: 16-bit
-***************************************************************/
-static const int16_t taps_fir_lpf_215_9_88 = 88;
-static const int32_t gain_fir_lpf_215_9_88 = 524288;
-static const int16_t coef_fir_lpf_215_9_88[] = {
- 2038,
- 2049,
- 1991,
- 1859,
- 1650,
- 1363,
-  999,
-  562,
-   58,
- -502,
--1106,
--1739,
--2382,
--3014,
--3612,
--4153,
--4610,
--4959,
--5172,
--5226,
--5098,
--4769,
--4222,
--3444,
--2430,
--1176,
-  310,
- 2021,
- 3937,
- 6035,
- 8284,
-10648,
-13086,
-15550,
-17993,
-20363,
-22608,
-24677,
-26522,
-28099,
-29369,
-30299,
-30867,
-31058,
-30867,
-30299,
-29369,
-28099,
-26522,
-24677,
-22608,
-20363,
-17993,
-15550,
-13086,
-10648,
- 8284,
- 6035,
- 3937,
- 2021,
-  310,
--1176,
--2430,
--3444,
--4222,
--4769,
--5098,
--5226,
--5172,
--4959,
--4610,
--4153,
--3612,
--3014,
--2382,
--1739,
--1106,
- -502,
-   58,
-  562,
-  999,
- 1363,
- 1650,
- 1859,
- 1991,
- 2049,
- 2038,
- 1966
-};
-// end coef fir_lpf_215_9_88
-//
-/**************************************************************
-Filter type: High Pass
-Filter model: Butterworth
-Filter order: 9
-Sampling Frequency: 8 KHz
-Cut Frequency: 0.300000 KHz
-Coefficents Quantization: 16-bit
-***************************************************************/
-static const int16_t taps_fir_hpf_300_9_66 = 66;
-static const int32_t gain_fir_hpf_300_9_66 = 32768;
-static const int16_t coef_fir_hpf_300_9_66[] = 
-{ 
- -141,
- -114,
-  -77,
-  -30,
-   23,
-   83,
-  147,
-  210,
-  271,
-  324,
-  367,
-  396,
-  407,
-  396,
-  362,
-  302,
-  216,
-  102,
-  -36,
- -199,
- -383,
- -585,
- -798,
--1017,
--1237,
--1452,
--1653,
--1836,
--1995,
--2124,
--2219,
--2278,
-30463,
--2278,
--2219,
--2124,
--1995,
--1836,
--1653,
--1452,
--1237,
--1017,
- -798,
- -585,
- -383,
- -199,
-  -36,
-  102,
-  216,
-  302,
-  362,
-  396,
-  407,
-  396,
-  367,
-  324,
-  271,
-  210,
-  147,
-   83,
-   23,
-  -30,
-  -77,
- -114,
- -141,
- -158
-    };
-#endif /* !XPMR_COEF_H */
-/* end of file */
-
-
-
-