diff options
| author | Johnathan Corgan | 2011-07-26 17:00:04 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2011-07-26 17:00:04 -0700 |
| commit | cc8f5c0dc6ca9ae6053343ee8efaf26884aa39cb (patch) | |
| tree | a5e89779924aff2b1e0e4fbfadedcb080737b9f4 /gr-comedi | |
| parent | d0112efa115d049a4bad62a1c6faac05332c8cf5 (diff) | |
| parent | 8cb0981894000e8239ee2425b4e99ded9841604a (diff) | |
| download | gnuradio-cc8f5c0dc6ca9ae6053343ee8efaf26884aa39cb.tar.gz gnuradio-cc8f5c0dc6ca9ae6053343ee8efaf26884aa39cb.tar.bz2 gnuradio-cc8f5c0dc6ca9ae6053343ee8efaf26884aa39cb.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gr-comedi')
| -rw-r--r-- | gr-comedi/src/comedi_sink_s.cc | 2 | ||||
| -rw-r--r-- | gr-comedi/src/comedi_source_s.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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()); |