Merge branch 'next' of gnuradio.org:gnuradio into next

9 files changed, 17 insertions, 18 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/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
index 7d04b523a..3a9d364d4 100644
--- a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
+++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
@@ -80,7 +80,6 @@ class GR_CORE_API gr_dc_blocker_cc : public gr_sync_block
    * Build the DC blocker.
    * \param D          (int) the length of the delay line
    * \param long_form  (bool) whether to use long (true, default) or short form
-   * \param channel (unsigned integer) Selects the channel to return [default=0].
    */
   GR_CORE_API friend gr_dc_blocker_cc_sptr gr_make_dc_blocker_cc (int D, bool long_form);
 
diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
index 6c6f93b8a..6045b69de 100644
--- a/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
+++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
@@ -80,7 +80,6 @@ class GR_CORE_API gr_dc_blocker_ff : public gr_sync_block
    * Build the DC blocker.
    * \param D          (int) the length of the delay line
    * \param long_form  (bool) whether to use long (true, default) or short form
-   * \param channel (unsigned integer) Selects the channel to return [default=0].
    */
   GR_CORE_API friend gr_dc_blocker_ff_sptr gr_make_dc_blocker_ff (int D, bool long_form);
 
diff --git a/gnuradio-core/src/lib/io/gri_wavfile.cc b/gnuradio-core/src/lib/io/gri_wavfile.cc
index b8375edc2..8f1c6a2bb 100644
--- a/gnuradio-core/src/lib/io/gri_wavfile.cc
+++ b/gnuradio-core/src/lib/io/gri_wavfile.cc
@@ -160,25 +160,25 @@ gri_wavheader_parse(FILE *fp,
     return false;
   }
   
-  fread(&file_size, 1, 4, fp);
+  fresult = fread(&file_size, 1, 4, fp);
   
   fresult = fread(str_buf, 1, 8, fp);
   if (fresult != 8 || strncmp(str_buf, "WAVEfmt ", 8) || feof(fp)) {
     return false;
   }
   
-  fread(&fmt_hdr_skip, 1, 4, fp);
+  fresult = fread(&fmt_hdr_skip, 1, 4, fp);
   
-  fread(&compression_type, 1, 2, fp);
+  fresult = fread(&compression_type, 1, 2, fp);
   if (wav_to_host(compression_type) != VALID_COMPRESSION_TYPE) {
     return false;
   }
   
-  fread(&nchans,            1, 2, fp);
-  fread(&sample_rate,       1, 4, fp);
-  fread(&avg_bytes_per_sec, 1, 4, fp);
-  fread(&block_align,       1, 2, fp);
-  fread(&bits_per_sample,   1, 2, fp);
+  fresult = fread(&nchans,            1, 2, fp);
+  fresult = fread(&sample_rate,       1, 4, fp);
+  fresult = fread(&avg_bytes_per_sec, 1, 4, fp);
+  fresult = fread(&block_align,       1, 2, fp);
+  fresult = fread(&bits_per_sample,   1, 2, fp);
   
   if (ferror(fp)) {
     return false;
@@ -204,7 +204,7 @@ gri_wavheader_parse(FILE *fp,
     return false;
   }
 
-  fread(&chunk_size, 1, 4, fp);
+  fresult = fread(&chunk_size, 1, 4, fp);
   if (ferror(fp)) {
     return false;
   }
@@ -226,7 +226,9 @@ short int
 gri_wav_read_sample(FILE *fp, int bytes_per_sample)
 {
   int16_t buf = 0;
-  fread(&buf, bytes_per_sample, 1, fp);
+  size_t fresult;
+
+  fresult = fread(&buf, bytes_per_sample, 1, fp);
   
   return (short) wav_to_host(buf);
 }
diff --git a/gr-pager/lib/pager_flex_sync.cc b/gr-pager/lib/pager_flex_sync.cc
index 61cf4ad38..30666298f 100644
--- a/gr-pager/lib/pager_flex_sync.cc
+++ b/gr-pager/lib/pager_flex_sync.cc
@@ -274,7 +274,7 @@ int pager_flex_sync::general_work(int noutput_items,
 
     while (i < ninputs && j < noutput_items) {
         unsigned char sym = *in++; i++;
-        d_index = ++d_index % d_spb;
+	d_index = (d_index+1) % d_spb;
     
         switch (d_state) {
             case ST_IDLE:
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
index faf34188c..a58a03264 100644
--- a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
+++ b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
@@ -51,9 +51,9 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
 class TRELLIS_API @NAME@ : public gr_block
 {
   fsm d_FSM1;
-  fsm d_FSM2;
   int d_ST10;
   int d_ST1K;
+  fsm d_FSM2;
   int d_ST20;
   int d_ST2K;
   interleaver d_INTERLEAVER;
diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
index f3ba783b4..9857c6a34 100644
--- a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
@@ -51,9 +51,9 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
 class TRELLIS_API @NAME@ : public gr_block
 {
   fsm d_FSMo;
-  fsm d_FSMi;
   int d_STo0;
   int d_SToK;
+  fsm d_FSMi;
   int d_STi0;
   int d_STiK;
   interleaver d_INTERLEAVER;
diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
index db0e494ca..5d2c2b85c 100644
--- a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
@@ -56,9 +56,9 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
 class TRELLIS_API @NAME@ : public gr_block
 {
   fsm d_FSMo;
-  fsm d_FSMi;
   int d_STo0;
   int d_SToK;
+  fsm d_FSMi;
   int d_STi0;
   int d_STiK;
   interleaver d_INTERLEAVER;
diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h
index 320d07d41..2adc5f1bf 100644
--- a/gr-uhd/include/gr_uhd_usrp_sink.h
+++ b/gr-uhd/include/gr_uhd_usrp_sink.h
@@ -125,7 +125,6 @@ public:
 
     /*!
      * Get the actual dboard gain setting of named stage.
-     * \param name the name of the gain stage
      * \param chan the channel index 0 to N-1
      * \return the actual gain in dB
      */