Added channel parameter to comedi_set_clock_source() and

comedi_get_clock_source().  Bumped library version to 0.10.0.

diff --git a/c++/include/comedilib.hpp b/c++/include/comedilib.hpp
index a999ec40fe29922640c7139f48d9341f0819f508..e7132dfcaca30df662d5aa14c897f7218f3743a5 100644 (file)
--- a/c++/include/comedilib.hpp
+++ b/c++/include/comedilib.hpp
@@ -418,9 +418,9 @@ namespace comedi
                        }
                        return retval;
                }
-               void get_clock_source(unsigned *clock, unsigned *period_ns) const
+               void get_clock_source(unsigned channel, unsigned *clock, unsigned *period_ns) const
                {
-                       int retval = comedi_get_clock_source(comedi_handle(), index(), clock, period_ns);
+                       int retval = comedi_get_clock_source(comedi_handle(), index(), channel, clock, period_ns);
                        if(retval < 0)
                        {
                                std::ostringstream message;
@@ -430,6 +430,18 @@ namespace comedi
                                throw std::runtime_error(message.str());
                        }
                }
+               void get_gate_source(unsigned channel, unsigned gate_index, unsigned *gate_source)
+               {
+                       int retval = comedi_get_gate_source(comedi_handle(), index(), channel, gate_index, gate_source);
+                       if (retval < 0)
+                       {
+                               std::ostringstream message;
+                               message << __PRETTY_FUNCTION__ << ": comedi_get_gate_source() failed.";
+                               std::cerr << message.str() << std::endl;
+                               comedi_perror("comedi_get_gate_source");
+                               throw std::runtime_error(message.str());
+                       }
+               }
                unsigned get_routing(unsigned channel) const
                {
                        unsigned routing = 0;
@@ -572,9 +584,9 @@ namespace comedi
                                throw std::runtime_error(message.str());
                        }
                }
-               void set_clock_source(unsigned clock, unsigned period_ns)
+               void set_clock_source(unsigned channel, unsigned clock, unsigned period_ns)
                {
-                       int retval = comedi_set_clock_source(comedi_handle(), index(), clock, period_ns);
+                       int retval = comedi_set_clock_source(comedi_handle(), index(), channel, clock, period_ns);
                        if(retval < 0)
                        {
                                std::ostringstream message;

diff --git a/configure.ac b/configure.ac
index 249d49745b6c6dccccd1a7f82ff5b694e1804735..01e8ad63910b9bb258131b53b72c7f68fe7369a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT([comedilib], [0.9.0])
+AC_INIT([comedilib], [0.10.0])
 AC_CANONICAL_TARGET([])
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -23,7 +23,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror])
 # age to 0.
 #
 # AS_LIBTOOL arguments are (prefix, current, revision, age)
-AS_LIBTOOL(COMEDILIB, 9, 0, 9)
+AS_LIBTOOL(COMEDILIB, 10, 0, 10)
 #libscxi c:r:a
 SCXI_SO_VERSION=9:0:9
 AC_SUBST(SCXI_SO_VERSION)

diff --git a/demo/choose_clock.c b/demo/choose_clock.c
index 7e0572747f7f20e7484b4c00473c952183bddedf..99e546ca22172eade2bcd4b230bc56dda3661138 100644 (file)
--- a/demo/choose_clock.c
+++ b/demo/choose_clock.c
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
        else
                period_ns = 0;
        clock_selection = options.value;
-       printf("Selecting master clock %d on subdevice %d.\n", clock_selection, options.subdevice);
+       printf("Selecting master clock %d for channel %d on subdevice.\n", clock_selection, options.channel, options.subdevice);
        if(period_ns)
        {
                printf("Clock period = %d nanoseconds.\n", period_ns);
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
                printf("Clock period unspecified.\n");
        }
 
-       retval = comedi_set_clock_source(device, options.subdevice, clock_selection, period_ns);
+       retval = comedi_set_clock_source(device, options.subdevice, options.channel, clock_selection, period_ns);
        if(retval < 0) comedi_perror("comedi_set_clock_source");
 
        comedi_close(device);

diff --git a/demo/gpct_pulse_generator.c b/demo/gpct_pulse_generator.c
index 7c85ae91b0d2c4ed6a53952e35b10dfec5af657e..0517a17f6f53b6c2fb82c5a82934d4d0d4de9778 100644 (file)
--- a/demo/gpct_pulse_generator.c
+++ b/demo/gpct_pulse_generator.c
@@ -73,7 +73,7 @@ int ni_gpct_start_pulse_generator(comedi_t *device, unsigned subdevice, unsigned
        if(retval < 0) return retval;
 
        /* 20MHz clock */
-       retval = comedi_set_clock_source(device, subdevice, NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS, clock_period_ns);
+       retval = comedi_set_clock_source(device, subdevice, 0, NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS, clock_period_ns);
        if(retval < 0) return retval;
 
        up_ticks = (up_time_ns + clock_period_ns / 2) / clock_period_ns;

diff --git a/doc/extensions_funcref.txt b/doc/extensions_funcref.txt
index 01c0a024ab1d3f9ab374fad54119a16597ed494c..bb533efd6167b973267eb4c725ea13d8519dc46e 100644 (file)
--- a/doc/extensions_funcref.txt
+++ b/doc/extensions_funcref.txt
@@ -18,6 +18,7 @@ Function: comedi_get_clock_source -- get master clock for a subdevice
 Retval: int
 Param: comedi_t * device
 Param: unsigned int subdevice
+Param: unsigned int channel
 Param: unsigned int *clock
 Param: unsigned int *period_ns
 Status: alpha
@@ -32,6 +33,9 @@ Description:
  The frequency of the clock in nanoseconds (or zero if it is unknown)
  will be written to
  *<parameter>period_ns</parameter>.
+ If the subdevice does not support configuring its master clocks
+ on a per-channel basis, then the <parameter>channel</parameter>
+ parameter will be ignored.
 
  It is safe to pass NULL pointers as the <parameter>clock</parameter> or
  <parameter>period_ns</parameter>
@@ -123,12 +127,17 @@ Function: comedi_set_clock_source -- set master clock for a subdevice
 Retval: int
 Param: comedi_t * device
 Param: unsigned int subdevice
+Param: unsigned int channel
 Param: unsigned int clock
 Param: unsigned int period_ns
 Status: alpha
 Description:
  This function selects a master clock for a subdevice.  The <parameter>clock</parameter>
- parameter selects the master clock, and is driver-dependant.  The <parameter>period_ns</parameter>
+ parameter selects the master clock, and is driver-dependant.  
+ If the subdevice does not support configuring its master clocks on a
+ per-channel basis, then the <parameter>channel</parameter> parameter
+ will be ignored.
+ The <parameter>period_ns</parameter>
  parameter specifies the clock's period in nanoseconds.  It may left unspecified by using
  a value of zero.  Drivers will ignore the clock period if they already
  know what the clock period should be for the specified clock (i.e. for an

diff --git a/include/comedilib.h b/include/comedilib.h
index 4a0012fd0522b06be0336841cf346c2bba15ce12..e21c0b700453c406f4434c71bcbe664cca3ab8bc 100644 (file)
--- a/include/comedilib.h
+++ b/include/comedilib.h
@@ -286,12 +286,12 @@ int comedi_internal_trigger(comedi_t *dev, unsigned subd, unsigned trignum);
 /* INSN_CONFIG wrappers */
 int comedi_arm(comedi_t *device, unsigned subdevice, unsigned source);
 int comedi_reset(comedi_t *device, unsigned subdevice);
-int comedi_get_clock_source(comedi_t *device, unsigned subdevice, unsigned *SWIG_OUTPUT(clock), unsigned *SWIG_OUTPUT(period_ns));
+int comedi_get_clock_source(comedi_t *device, unsigned subdevice, unsigned channel, unsigned *SWIG_OUTPUT(clock), unsigned *SWIG_OUTPUT(period_ns));
 int comedi_get_gate_source(comedi_t *device, unsigned subdevice, unsigned channel,
        unsigned gate, unsigned *SWIG_OUTPUT(source));
 int comedi_get_routing(comedi_t *device, unsigned subdevice, unsigned channel, unsigned *SWIG_OUTPUT(routing));
 int comedi_set_counter_mode(comedi_t *device, unsigned subdevice, unsigned channel, unsigned mode_bits);
-int comedi_set_clock_source(comedi_t *device, unsigned subdevice, unsigned clock, unsigned period_ns);
+int comedi_set_clock_source(comedi_t *device, unsigned subdevice, unsigned channel, unsigned clock, unsigned period_ns);
 int comedi_set_filter(comedi_t *device, unsigned subdevice, unsigned channel, unsigned filter);
 int comedi_set_gate_source(comedi_t *device, unsigned subdevice, unsigned channel, unsigned gate_index, unsigned gate_source);
 int comedi_set_other_source(comedi_t *device, unsigned subdevice, unsigned channel,

diff --git a/lib/insn_config_wrappers.c b/lib/insn_config_wrappers.c
index 83614256e8649fb1af315f6d2d1e5ff7302046a0..3fc8f56d510ed37ebb4376b5b85f651b9bea54fd 100644 (file)
--- a/lib/insn_config_wrappers.c
+++ b/lib/insn_config_wrappers.c
@@ -63,8 +63,8 @@ int _comedi_arm(comedi_t *device, unsigned subdevice, unsigned target)
        else return -1;
 }
 
-EXPORT_ALIAS_DEFAULT(_comedi_get_clock_source,comedi_get_clock_source,0.9.0);
-int _comedi_get_clock_source(comedi_t *device, unsigned subdevice, unsigned *clock, unsigned *period_ns)
+EXPORT_ALIAS_DEFAULT(_comedi_get_clock_source,comedi_get_clock_source,0.10.0);
+int _comedi_get_clock_source(comedi_t *device, unsigned subdevice, unsigned channel, unsigned *clock, unsigned *period_ns)
 {
        comedi_insn insn;
        lsampl_t data[3];
@@ -73,7 +73,7 @@ int _comedi_get_clock_source(comedi_t *device, unsigned subdevice, unsigned *clo
        memset(&insn, 0, sizeof(comedi_insn));
        insn.insn = INSN_CONFIG;
        insn.subdev = subdevice;
-       insn.chanspec = 0;
+       insn.chanspec = channel;
        insn.data = data;
        insn.n = sizeof(data) / sizeof(data[0]);
        memset(data, 0, insn.n * sizeof(data[0]));
@@ -86,6 +86,12 @@ int _comedi_get_clock_source(comedi_t *device, unsigned subdevice, unsigned *clo
        return 0;
 }
 
+EXPORT_ALIAS_VER(_comedi_get_clock_source_chan0,comedi_get_clock_source,0.9.0);
+int _comedi_get_clock_source_chan0(comedi_t *device, unsigned subdevice, unsigned *clock, unsigned *period_ns)
+{
+       return _comedi_get_clock_source(device, subdevice, 0, clock, period_ns);
+}
+
 EXPORT_ALIAS_DEFAULT(_comedi_get_gate_source,comedi_get_gate_source,0.9.0);
 int _comedi_get_gate_source(comedi_t *device, unsigned subdevice, unsigned channel,
        unsigned gate, unsigned *source)
@@ -151,8 +157,8 @@ int _comedi_set_counter_mode(comedi_t *device, unsigned subdevice, unsigned chan
        else return -1;
 }
 
-EXPORT_ALIAS_DEFAULT(_comedi_set_clock_source,comedi_set_clock_source,0.9.0);
-int _comedi_set_clock_source(comedi_t *device, unsigned subdevice, unsigned clock, unsigned period_ns)
+EXPORT_ALIAS_DEFAULT(_comedi_set_clock_source,comedi_set_clock_source,0.10.0);
+int _comedi_set_clock_source(comedi_t *device, unsigned subdevice, unsigned channel, unsigned clock, unsigned period_ns)
 {
        comedi_insn insn;
        lsampl_t data[3];
@@ -171,6 +177,12 @@ int _comedi_set_clock_source(comedi_t *device, unsigned subdevice, unsigned cloc
        else return -1;
 }
 
+EXPORT_ALIAS_VER(_comedi_set_clock_source_chan0,comedi_set_clock_source,0.9.0);
+int _comedi_set_clock_source_chan0(comedi_t *device, unsigned subdevice, unsigned clock, unsigned period_ns)
+{
+       return _comedi_set_clock_source(device, subdevice, 0, clock, period_ns);
+}
+
 EXPORT_ALIAS_DEFAULT(_comedi_set_filter,comedi_set_filter,0.9.0);
 int _comedi_set_filter(comedi_t *device, unsigned subdevice, unsigned channel, unsigned filter)
 {

diff --git a/lib/version_script b/lib/version_script
index 6721f23bd9772053133d0933e3de0ac768906f20..6655605e2ab1b1a8f6e869ce65a74eb4a82ca4e9 100644 (file)
--- a/lib/version_script
+++ b/lib/version_script
@@ -110,3 +110,9 @@ v0.9.0 {
                comedi_set_routing;
                comedi_get_hardware_buffer_size;
 } v0.8.0;
+
+v0.10.0 {
+       global:
+               comedi_get_clock_source;
+               comedi_set_clock_source;
+} v0.9.0;