summaryrefslogtreecommitdiff
path: root/usrp2
diff options
context:
space:
mode:
authormatt2008-12-13 23:28:58 +0000
committermatt2008-12-13 23:28:58 +0000
commit0a5eb9fc28515627ef6d2937e26aadd0a4fd53cf (patch)
tree3270b4c39858f6c3b4fe04af55f0b428fed0566f /usrp2
parent11095bc27990afc62defa06e4304fe26b0457ae6 (diff)
downloadgnuradio-0a5eb9fc28515627ef6d2937e26aadd0a4fd53cf.tar.gz
gnuradio-0a5eb9fc28515627ef6d2937e26aadd0a4fd53cf.tar.bz2
gnuradio-0a5eb9fc28515627ef6d2937e26aadd0a4fd53cf.zip
reset the phase when we shut down. Aids in sync
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10115 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp2')
-rw-r--r--usrp2/fpga/sdr_lib/dsp_core_rx.v4
-rw-r--r--usrp2/fpga/sdr_lib/dsp_core_tx.v6
2 files changed, 7 insertions, 3 deletions
diff --git a/usrp2/fpga/sdr_lib/dsp_core_rx.v b/usrp2/fpga/sdr_lib/dsp_core_rx.v
index 0e4af37fb..64c82bbda 100644
--- a/usrp2/fpga/sdr_lib/dsp_core_rx.v
+++ b/usrp2/fpga/sdr_lib/dsp_core_rx.v
@@ -84,7 +84,9 @@ module dsp_core_rx
always @(posedge clk)
if(rst)
phase <= 0;
- else if(run)
+ else if(~run)
+ phase <= 0;
+ else
phase <= phase + phase_inc;
MULT18X18S mult_i
diff --git a/usrp2/fpga/sdr_lib/dsp_core_tx.v b/usrp2/fpga/sdr_lib/dsp_core_tx.v
index 535f2003e..54889fa2a 100644
--- a/usrp2/fpga/sdr_lib/dsp_core_tx.v
+++ b/usrp2/fpga/sdr_lib/dsp_core_tx.v
@@ -58,11 +58,13 @@ module dsp_core_tx
always @(posedge clk) strobe_hb2 <= strobe_hb2_pre;
always @(posedge clk) strobe_cic <= strobe_cic_pre;
- // DDC
+ // NCO
always @(posedge clk)
if(rst)
phase <= 0;
- else if(run)
+ else if(~run)
+ phase <= 0;
+ else
phase <= phase + phase_inc;
wire signed [17:0] da, db;