[Commit-gnuradio] r8522 - usrp2/trunk/firmware/apps

[matt]

Author: matt
Date: 2008-05-28 18:29:35 -0600 (Wed, 28 May 2008)
New Revision: 8522

Modified:
   usrp2/trunk/firmware/apps/txrx.c
Log:
get rid of silly -1 requirement on interp and decim, plus enable halfbands on 
RX side.  Requires new fpga image


Modified: usrp2/trunk/firmware/apps/txrx.c
===================================================================
--- usrp2/trunk/firmware/apps/txrx.c    2008-05-29 00:28:16 UTC (rev 8521)
+++ usrp2/trunk/firmware/apps/txrx.c    2008-05-29 00:29:35 UTC (rev 8522)
@@ -150,7 +150,7 @@
   }
 
   if (p->valid & CFGV_INTERP_DECIM){
-    dsp_tx_regs->interp_rate = p->interp - 1;  // register gets N-1
+    dsp_tx_regs->interp_rate = p->interp;
   }
 
   if (p->valid & CFGV_SCALE_IQ){
@@ -180,7 +180,22 @@
   }
 
   if (p->valid & CFGV_INTERP_DECIM){
-    dsp_rx_regs->decim_rate = p->decim - 1;    // register gets N-1
+    int decim = p->decim;
+    int hb1 = 0;
+    int hb2 = 0;
+    
+    if(!(decim & 1)) {
+      hb2 = 1;
+      decim = decim >> 1;
+    }
+    
+    if(!(decim & 1)) {
+      hb1 = 1;
+      decim = decim >> 1;
+    }
+    
+    dsp_rx_regs->decim_rate = (hb1<<9) | (hb2<<8) | decim;
+    printf("Decim: %d, register %d\n",p->decim,(hb1<<9) | (hb2<<8) | decim);
   }
 
   if (p->valid & CFGV_SCALE_IQ){
@@ -270,7 +285,7 @@
 
   dsp_tx_regs->freq = 0;
   dsp_tx_regs->scale_iq = (tx_scale << 16) | tx_scale;
-  dsp_tx_regs->interp_rate = interp - 1;               // register gets N-1
+  dsp_tx_regs->interp_rate = interp;
 }