[Commit-gnuradio] r7289 - in gnuradio/branches/releases/3.1/usrp/fpga: rbf/rev2 rbf/rev4 sdr_lib

[jcorgan]

Author: jcorgan
Date: 2007-12-27 13:44:00 -0700 (Thu, 27 Dec 2007)
New Revision: 7289

Modified:
   gnuradio/branches/releases/3.1/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
   gnuradio/branches/releases/3.1/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf
   gnuradio/branches/releases/3.1/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
   gnuradio/branches/releases/3.1/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf
   gnuradio/branches/releases/3.1/usrp/fpga/sdr_lib/rx_buffer.v
Log:
Applied changeset r6858 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
===================================================================
(Binary files differ)

Modified: gnuradio/branches/releases/3.1/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf
===================================================================
(Binary files differ)

Modified: gnuradio/branches/releases/3.1/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
===================================================================
(Binary files differ)

Modified: gnuradio/branches/releases/3.1/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf
===================================================================
(Binary files differ)

Modified: gnuradio/branches/releases/3.1/usrp/fpga/sdr_lib/rx_buffer.v
===================================================================
--- gnuradio/branches/releases/3.1/usrp/fpga/sdr_lib/rx_buffer.v        
2007-12-27 20:37:52 UTC (rev 7288)
+++ gnuradio/branches/releases/3.1/usrp/fpga/sdr_lib/rx_buffer.v        
2007-12-27 20:44:00 UTC (rev 7289)
@@ -136,7 +136,7 @@
            phase <= 4'd1;
        end
      else if(~rx_full)
-       if(phase == channels)
+       if(phase == ((bitwidth == 5'd8) ? (channels>>1) : channels))
         phase <= 4'd0;
        else
         phase <= phase + 4'd1;