diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2011-07-26 16:49:17 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2011-07-26 16:50:24 -0700 |
| commit | 8cb0981894000e8239ee2425b4e99ded9841604a (patch) | |
| tree | 6a7fcdeb3185ba75d7a6a788814eae33d1a824e2 | |
| parent | 7ab44e1b23a1a9307b5edfc12dcd4f4b7c834a6e (diff) | |
comedi: fix to use comedi 0.8 API
| -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 5e3089417..7e54b0f5a 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 d4a668758..fc5c14931 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 a52d04e2a..5d9f2f6b0 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()); |