[Commit-gnuradio] r9136 - gnuradio/branches/releases/3.1/usrp/host/lib/legacy

[jcorgan]

Author: jcorgan
Date: 2008-08-01 13:45:43 -0600 (Fri, 01 Aug 2008)
New Revision: 9136

Modified:
   gnuradio/branches/releases/3.1/usrp/host/lib/legacy/usrp_standard.cc
Log:
Applied changeset r8996 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/usrp/host/lib/legacy/usrp_standard.cc
===================================================================
--- gnuradio/branches/releases/3.1/usrp/host/lib/legacy/usrp_standard.cc        
2008-08-01 19:43:13 UTC (rev 9135)
+++ gnuradio/branches/releases/3.1/usrp/host/lib/legacy/usrp_standard.cc        
2008-08-01 19:45:43 UTC (rev 9136)
@@ -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 ())