summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2007-11-10 19:23:57 +0000
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2007-11-10 19:23:57 +0000
commit320e6a0afb53b6c596eb8cbabe08aa139508f9ec (patch)
tree8a7db694343622a6a54c1a58eb5d34a2809f8fb9
parentd15e9b2a599c5919152362331189a7cafcb7c457 (diff)
Restores 8-bit sample format support to FPGA code. Synthesized with 7.1SP1.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6858 221aa14e-8319-0410-a670-987f0aec2ac5
-rwxr-xr-xusrp/fpga/rbf/rev2/std_2rxhb_2tx.rbfbin180944 -> 181148 bytes
-rwxr-xr-xusrp/fpga/rbf/rev2/std_4rx_0tx.rbfbin181726 -> 183046 bytes
-rwxr-xr-xusrp/fpga/rbf/rev4/std_2rxhb_2tx.rbfbin180944 -> 181148 bytes
-rwxr-xr-xusrp/fpga/rbf/rev4/std_4rx_0tx.rbfbin181726 -> 183046 bytes
-rw-r--r--usrp/fpga/sdr_lib/rx_buffer.v2
5 files changed, 1 insertions, 1 deletions
diff --git a/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf b/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
index 072bd8dded..f098487042 100755
--- a/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
+++ b/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
Binary files differ
diff --git a/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf b/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf
index 43f901d311..1deca9517c 100755
--- a/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf
+++ b/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf
Binary files differ
diff --git a/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf b/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
index 072bd8dded..f098487042 100755
--- a/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
+++ b/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
Binary files differ
diff --git a/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf b/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf
index 43f901d311..1deca9517c 100755
--- a/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf
+++ b/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf
Binary files differ
diff --git a/usrp/fpga/sdr_lib/rx_buffer.v b/usrp/fpga/sdr_lib/rx_buffer.v
index 7c52925c99..d17294b987 100644
--- a/usrp/fpga/sdr_lib/rx_buffer.v
+++ b/usrp/fpga/sdr_lib/rx_buffer.v
@@ -136,7 +136,7 @@ module rx_buffer
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;