[Hamlib-cvs-digest] SF.net SVN: hamlib:[2845] trunk

[<fi...@us...>]

Revision: 2845
          http://hamlib.svn.sourceforge.net/hamlib/?rev=2845&view=rev
Author:   fillods
Date:     2010-03-05 18:48:40 +0000 (Fri, 05 Mar 2010)

Log Message:
-----------
allow tones and func calls to be targetable

Modified Paths:
--------------
    trunk/include/hamlib/rig.h
    trunk/src/settings.c
    trunk/src/tones.c

Modified: trunk/include/hamlib/rig.h
===================================================================
--- trunk/include/hamlib/rig.h	2010-03-03 08:34:00 UTC (rev 2844)
+++ trunk/include/hamlib/rig.h	2010-03-05 18:48:40 UTC (rev 2845)
@@ -358,6 +358,8 @@
 #define RIG_TARGETABLE_FREQ (1<<0)
 #define RIG_TARGETABLE_MODE (1<<1)
 #define RIG_TARGETABLE_PURE (1<<2)
+#define RIG_TARGETABLE_TONE (1<<3)
+#define RIG_TARGETABLE_FUNC (1<<4)
 #define RIG_TARGETABLE_ALL  0x7fffffff
 
 

Modified: trunk/src/settings.c
===================================================================
--- trunk/src/settings.c	2010-03-03 08:34:00 UTC (rev 2844)
+++ trunk/src/settings.c	2010-03-05 18:48:40 UTC (rev 2845)
@@ -7,14 +7,14 @@
  * \file settings.c
  * \brief func/level/parm interface
  * \author Stephane Fillod
- * \date 2000-2009
+ * \date 2000-2010
  *
  * Hamlib interface is a frontend implementing wrapper functions.
  */
 
 /*
  *  Hamlib Interface - func/level/parm
- *  Copyright (c) 2000-2009 by Stephane Fillod
+ *  Copyright (c) 2000-2010 by Stephane Fillod
  *
  *	$Id: settings.c,v 1.14 2009-02-20 12:26:13 fillods Exp $
  *
@@ -409,7 +409,7 @@
 	if (caps->set_func == NULL || !rig_has_set_func(rig,func))
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) ||
+	if ((caps->targetable_vfo&RIG_TARGETABLE_FUNC) ||
 			vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->set_func(rig, vfo, func, status);
 
@@ -458,7 +458,7 @@
 	if (caps->get_func == NULL || !rig_has_get_func(rig,func))
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) ||
+	if ((caps->targetable_vfo&RIG_TARGETABLE_FUNC) ||
 			vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->get_func(rig, vfo, func, status);
 

Modified: trunk/src/tones.c
===================================================================
--- trunk/src/tones.c	2010-03-03 08:34:00 UTC (rev 2844)
+++ trunk/src/tones.c	2010-03-05 18:48:40 UTC (rev 2845)
@@ -7,11 +7,11 @@
  * \file src/tones.c
  * \brief CTCSS and DCS interface and tables
  * \author Stephane Fillod
- * \date 2000-2009
+ * \date 2000-2010
  */
 /*
  *  Hamlib Interface - CTCSS and DCS interface and tables
- *  Copyright (c) 2000-2009 by Stephane Fillod
+ *  Copyright (c) 2000-2010 by Stephane Fillod
  *
  *	$Id: tones.c,v 1.11 2009-02-20 12:26:13 fillods Exp $
  *
@@ -110,7 +110,7 @@
 	if (caps->set_ctcss_tone == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) || 
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) || 
 				vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->set_ctcss_tone(rig, vfo, tone);
 
@@ -159,7 +159,7 @@
 	if (caps->get_ctcss_tone == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) || 
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) || 
 				vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->get_ctcss_tone(rig, vfo, tone);
 
@@ -204,7 +204,7 @@
 	if (caps->set_dcs_code == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) || 
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) || 
 				vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->set_dcs_code(rig, vfo, code);
 
@@ -248,7 +248,7 @@
 	if (caps->get_dcs_code == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) || 
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) || 
 				vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->get_dcs_code(rig, vfo, code);
 
@@ -298,7 +298,7 @@
 	if (caps->set_ctcss_sql == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) || 
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) || 
 				vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->set_ctcss_sql(rig, vfo, tone);
 
@@ -347,7 +347,7 @@
 	if (caps->get_ctcss_sql == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) ||
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) ||
 			vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->get_ctcss_sql(rig, vfo, tone);
 
@@ -392,7 +392,7 @@
 	if (caps->set_dcs_sql == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) ||
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) ||
 			vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->set_dcs_sql(rig, vfo, code);
 
@@ -436,7 +436,7 @@
 	if (caps->get_dcs_sql == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) ||
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) ||
 			vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->get_dcs_sql(rig, vfo, code);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.