aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp3/lib/rfnoc
diff options
context:
space:
mode:
authorWade Fife <wade.fife@ettus.com>2021-07-09 13:55:25 -0500
committerWade Fife <wade.fife@ettus.com>2021-08-08 14:59:26 -0500
commit18e5bdfa100a40376147d1a497645345b2a938b1 (patch)
tree12af7483a88e873ffe47f4cbc171385ab77eeac5 /fpga/usrp3/lib/rfnoc
parent0a1be828cbc1d311eb48201ebc45dfb24ce82849 (diff)
downloaduhd-18e5bdfa100a40376147d1a497645345b2a938b1.tar.gz
uhd-18e5bdfa100a40376147d1a497645345b2a938b1.tar.bz2
uhd-18e5bdfa100a40376147d1a497645345b2a938b1.zip
rfnoc: duc: Remove stale references to CORDIC
Updated some comments that still referenced the old CORDIC implementation, which is no longer used.
Diffstat (limited to 'fpga/usrp3/lib/rfnoc')
-rw-r--r--fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_duc/rfnoc_block_duc.v33
1 files changed, 15 insertions, 18 deletions
diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_duc/rfnoc_block_duc.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_duc/rfnoc_block_duc.v
index 48a439105..2c4015da7 100644
--- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_duc/rfnoc_block_duc.v
+++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_duc/rfnoc_block_duc.v
@@ -1,6 +1,5 @@
//
-// Copyright 2019 Ettus Research, a National Instruments Company
-// Copyright 2020 Ettus Research, a National Instruments Brand
+// Copyright 2021 Ettus Research, a National Instruments Brand
//
// SPDX-License-Identifier: LGPL-3.0-or-later
//
@@ -19,6 +18,10 @@
// CIC_MAX_INTERP : Maximum interpolation to support in the CIC filter
//
+`default_nettype none
+
+
+
module rfnoc_block_duc #(
parameter THIS_PORTID = 0,
parameter CHDR_W = 64,
@@ -276,14 +279,9 @@ module rfnoc_block_duc #(
endcase
end
- ////////////////////////////////////////////////////////////
- //
- // Timed CORDIC
- // - Implements timed cordic tunes. Placed between AXI Wrapper
- // and AXI Rate Change due to it needing access to the
- // vita time of the samples.
- //
- ////////////////////////////////////////////////////////////
+ //-------------------------------
+ // Timed DDS + Complex Multiplier
+ //-------------------------------
wire [31:0] m_axis_rc_tdata;
wire m_axis_rc_tlast;
wire m_axis_rc_tvalid;
@@ -303,11 +301,9 @@ module rfnoc_block_duc #(
.o_tdata(s_axis_data_tdata[ITEM_W*i+:ITEM_W]), .o_tlast(s_axis_data_tlast[i]), .o_tvalid(s_axis_data_tvalid[i]),
.o_tready(s_axis_data_tready[i]), .o_tuser(s_axis_data_tuser[128*i+:128]));
- ////////////////////////////////////////////////////////////
- //
+ //-------------------------------
// Increase Rate
- //
- ////////////////////////////////////////////////////////////
+ //-------------------------------
wire [31:0] sample_tdata, sample_duc_tdata;
wire sample_tvalid, sample_tready;
wire sample_duc_tvalid, sample_duc_tready;
@@ -333,11 +329,9 @@ module rfnoc_block_duc #(
.s_axis_data_tready(sample_duc_tready),
.warning_long_throttle(), .error_extra_outputs(), .error_drop_pkt_lockup());
- ////////////////////////////////////////////////////////////
- //
+ //-------------------------------
// Digital Up Converter
- //
- ////////////////////////////////////////////////////////////
+ //-------------------------------
duc #(
.SR_INTERP_ADDR(SR_INTERP_ADDR),
.NUM_HB(NUM_HB),
@@ -352,3 +346,6 @@ module rfnoc_block_duc #(
endgenerate
endmodule
+
+
+`default_nettype wire