diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2011-07-26 17:00:04 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2011-07-26 17:00:04 -0700 |
| commit | cc8f5c0dc6ca9ae6053343ee8efaf26884aa39cb (patch) | |
| tree | a5e89779924aff2b1e0e4fbfadedcb080737b9f4 | |
| parent | d0112efa115d049a4bad62a1c6faac05332c8cf5 (diff) | |
| parent | 8cb0981894000e8239ee2425b4e99ded9841604a (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | config/grc_gr_comedi.m4 | 2 | ||||
| -rw-r--r-- | gr-comedi/src/comedi_sink_s.cc | 2 | ||||
| -rw-r--r-- | gr-comedi/src/comedi_source_s.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4 index 5e30894174..7e54b0f5a7 100644 --- a/config/grc_gr_comedi.m4 +++ b/config/grc_gr_comedi.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_COMEDI],[ dnl no : otherwise if test $passed = yes; then dnl Don't do gr-comedi if the 'comedi' library is unavailable. - PKG_CHECK_MODULES(COMEDI, comedilib < 0.8,[], + PKG_CHECK_MODULES(COMEDI, comedilib >= 0.8,[], [passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])]) fi diff --git a/gr-comedi/src/comedi_sink_s.cc b/gr-comedi/src/comedi_sink_s.cc index d4a6687588..fc5c14931a 100644 --- a/gr-comedi/src/comedi_sink_s.cc +++ b/gr-comedi/src/comedi_sink_s.cc @@ -88,7 +88,7 @@ comedi_sink_s::comedi_sink_s (int sampling_freq, comedi_cmd cmd; int ret; - ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq)); + ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,d_n_chan,(unsigned int)(1e9/sampling_freq)); if(ret<0) bail ("comedi_get_cmd_generic_timed", comedi_errno()); diff --git a/gr-comedi/src/comedi_source_s.cc b/gr-comedi/src/comedi_source_s.cc index a52d04e2a3..5d9f2f6b0f 100644 --- a/gr-comedi/src/comedi_source_s.cc +++ b/gr-comedi/src/comedi_source_s.cc @@ -85,7 +85,7 @@ comedi_source_s::comedi_source_s (int sampling_freq, comedi_cmd cmd; int ret; - ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq)); + ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,d_n_chan,(unsigned int)(1e9/sampling_freq)); if(ret<0) bail ("comedi_get_cmd_generic_timed", comedi_errno()); |