[Commit-gnuradio] r8996 - gnuradio/trunk/usrp/host/lib/legacy

[eb]

Author: eb
Date: 2008-07-24 11:48:46 -0600 (Thu, 24 Jul 2008)
New Revision: 8996

Modified:
   gnuradio/trunk/usrp/host/lib/legacy/usrp_standard.cc
Log:
Allow odd decimation if halfband filter is disabled.  Thanks Firas!


Modified: gnuradio/trunk/usrp/host/lib/legacy/usrp_standard.cc
===================================================================
--- gnuradio/trunk/usrp/host/lib/legacy/usrp_standard.cc        2008-07-24 
17:34:45 UTC (rev 8995)
+++ gnuradio/trunk/usrp/host/lib/legacy/usrp_standard.cc        2008-07-24 
17:48:46 UTC (rev 8996)
@@ -239,10 +239,18 @@
 bool
 usrp_standard_rx::set_decim_rate(unsigned int rate)
 {
-  if ((rate & 0x1) || rate < 4 || rate > 256){
-    fprintf (stderr, "usrp_standard_rx::set_decim_rate: rate must be EVEN and 
in [4, 256]\n");
-    return false;
+  if (has_rx_halfband()){
+    if ((rate & 0x1) || rate < 4 || rate > 256){
+      fprintf (stderr, "usrp_standard_rx::set_decim_rate: rate must be EVEN 
and in [4, 256]\n");
+      return false;
+    }
   }
+  else {
+    if (rate < 4 || rate > 128){
+      fprintf (stderr, "usrp_standard_rx::set_decim_rate: rate must be in [4, 
128]\n");
+      return false;
+    }
+  }
 
   d_decim_rate = rate;
   set_usb_data_rate ((adc_rate () / rate * nchannels ())