diff options
author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-07-12 00:54:37 +0000 |
---|---|---|
committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-07-12 00:54:37 +0000 |
commit | b827fdb70e17c64691a0e07e0739706c58b70b8c (patch) | |
tree | 6396430b0d722f7b2b9ad7d2473a10223aabef87 | |
parent | 8c62b0535cc1a839c076719b6e0c899e63e6624c (diff) | |
download | uhd-b827fdb70e17c64691a0e07e0739706c58b70b8c.tar.gz uhd-b827fdb70e17c64691a0e07e0739706c58b70b8c.tar.bz2 uhd-b827fdb70e17c64691a0e07e0739706c58b70b8c.zip |
Merged r5732:5941 from jcorgan/sar into trunk. Adds start of gr-radar-mono component. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5942 221aa14e-8319-0410-a670-987f0aec2ac5
-rwxr-xr-x | rbf/rev2/std_2rxhb_2tx.rbf | bin | 180080 -> 180657 bytes | |||
-rwxr-xr-x | rbf/rev4/std_2rxhb_2tx.rbf | bin | 180080 -> 180657 bytes | |||
-rwxr-xr-x | sdr_lib/cordic.v | 2 | ||||
-rwxr-xr-x | sdr_lib/cordic_stage.v | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/rbf/rev2/std_2rxhb_2tx.rbf b/rbf/rev2/std_2rxhb_2tx.rbf Binary files differindex 340a68346..71c301333 100755 --- a/rbf/rev2/std_2rxhb_2tx.rbf +++ b/rbf/rev2/std_2rxhb_2tx.rbf diff --git a/rbf/rev4/std_2rxhb_2tx.rbf b/rbf/rev4/std_2rxhb_2tx.rbf Binary files differindex 340a68346..71c301333 100755 --- a/rbf/rev4/std_2rxhb_2tx.rbf +++ b/rbf/rev4/std_2rxhb_2tx.rbf diff --git a/sdr_lib/cordic.v b/sdr_lib/cordic.v index fee241f62..ea4119426 100755 --- a/sdr_lib/cordic.v +++ b/sdr_lib/cordic.v @@ -66,7 +66,7 @@ module cordic(clock, reset, enable, xi, yi, zi, xo, yo, zo ); begin x0 <= #1 0; y0 <= #1 0; z0 <= #1 0; end - else// if(enable) + else if(enable) begin z0 <= #1 zi[zwidth-2:0]; case (zi[zwidth-1:zwidth-2]) diff --git a/sdr_lib/cordic_stage.v b/sdr_lib/cordic_stage.v index 0106da5cb..d44998b0d 100755 --- a/sdr_lib/cordic_stage.v +++ b/sdr_lib/cordic_stage.v @@ -45,7 +45,7 @@ module cordic_stage( clock, reset, enable, xi,yi,zi,constant,xo,yo,zo); yo <= #1 0; zo <= #1 0; end - else //if(enable) + else if(enable) begin xo <= #1 z_is_pos ? xi - {{shift+1{yi[bitwidth-1]}},yi[bitwidth-2:shift]} : |