diff options
| author | Martin Braun <martin.braun@ettus.com> | 2022-01-20 14:41:51 +0100 |
|---|---|---|
| committer | Wade Fife <wade.fife@ettus.com> | 2022-01-25 14:09:15 -0700 |
| commit | b29af0ea0d340f37628f65e7b739fa1865d212a9 (patch) | |
| tree | 677f4821cda4e0a643c4ac128f3fc44bf39a680c /fpga/usrp3/lib | |
| parent | 3cfecebc14c5e3ea2e1b9dd73f08281e3c7a2169 (diff) | |
| download | uhd-b29af0ea0d340f37628f65e7b739fa1865d212a9.tar.gz uhd-b29af0ea0d340f37628f65e7b739fa1865d212a9.tar.bz2 uhd-b29af0ea0d340f37628f65e7b739fa1865d212a9.zip | |
fpga: Remove noc_shell_regs.vh and sim_rfnoc_lib.svh
Both files are a UHD 3 remnant and potentially confusing for UHD
4 codebase readers.
Diffstat (limited to 'fpga/usrp3/lib')
| -rw-r--r-- | fpga/usrp3/lib/rfnoc/Makefile.srcs | 1 | ||||
| -rw-r--r-- | fpga/usrp3/lib/rfnoc/noc_shell_regs.vh | 25 | ||||
| -rw-r--r-- | fpga/usrp3/lib/sim/arm_deframer/Makefile | 1 | ||||
| -rw-r--r-- | fpga/usrp3/lib/sim/arm_deframer/arm_deframer_tb.sv | 2 |
4 files changed, 1 insertions, 28 deletions
diff --git a/fpga/usrp3/lib/rfnoc/Makefile.srcs b/fpga/usrp3/lib/rfnoc/Makefile.srcs index 512569748..f654fdb9c 100644 --- a/fpga/usrp3/lib/rfnoc/Makefile.srcs +++ b/fpga/usrp3/lib/rfnoc/Makefile.srcs @@ -19,7 +19,6 @@ RFNOC_FRAMEWORK_SRCS = $(RFNOC_CORE_SRCS) $(RFNOC_XBAR_SRCS) $(RFNOC_UTIL_SRCS) ################################################## RFNOC_SRCS = $(abspath $(addprefix $(BASE_DIR)/../lib/rfnoc/, \ chdr_fifo_large.v \ -noc_shell_regs.vh \ axi_bit_reduce.v \ null_source.v \ split_stream.v \ diff --git a/fpga/usrp3/lib/rfnoc/noc_shell_regs.vh b/fpga/usrp3/lib/rfnoc/noc_shell_regs.vh deleted file mode 100644 index a81bd4119..000000000 --- a/fpga/usrp3/lib/rfnoc/noc_shell_regs.vh +++ /dev/null @@ -1,25 +0,0 @@ - // Registers 0 - 127 for NoC Shell - localparam [7:0] SR_FLOW_CTRL_BYTES_PER_ACK = 1; - localparam [7:0] SR_FLOW_CTRL_WINDOW_SIZE = 2; - localparam [7:0] SR_FLOW_CTRL_EN = 3; - localparam [7:0] SR_ERROR_POLICY = 4; - localparam [7:0] SR_SRC_SID = 5; - localparam [7:0] SR_NEXT_DST_SID = 6; - localparam [7:0] SR_RESP_IN_DST_SID = 7; - localparam [7:0] SR_RESP_OUT_DST_SID = 8; - localparam [7:0] SR_FLOW_CTRL_PKT_LIMIT = 9; - localparam [7:0] SR_RB_ADDR_USER = 124; - localparam [7:0] SR_CLEAR_RX_FC = 125; - localparam [7:0] SR_CLEAR_TX_FC = 126; - localparam [7:0] SR_RB_ADDR = 127; - // Registers 128-255 for users - localparam [7:0] SR_USER_REG_BASE = 128; - - // NoC Shell readback registers - localparam [7:0] RB_NOC_ID = 0; - localparam [7:0] RB_GLOBAL_PARAMS = 1; - localparam [7:0] RB_FIFOSIZE = 2; - localparam [7:0] RB_MTU = 3; - localparam [7:0] RB_BLOCK_PORT_SIDS = 4; - localparam [7:0] RB_USER_RB_DATA = 5; - localparam [7:0] RB_NOC_SHELL_COMPAT_NUM = 6; diff --git a/fpga/usrp3/lib/sim/arm_deframer/Makefile b/fpga/usrp3/lib/sim/arm_deframer/Makefile index 3075cf3cc..c278b3903 100644 --- a/fpga/usrp3/lib/sim/arm_deframer/Makefile +++ b/fpga/usrp3/lib/sim/arm_deframer/Makefile @@ -32,7 +32,6 @@ DESIGN_SRCS += $(abspath \ SIM_TOP = arm_deframer_tb SIM_SRCS = $(abspath \ -$(SIM_PROTORFNOC_SRCS) \ $(RFNOC_SRCS) \ arm_deframer_tb.sv \ ) diff --git a/fpga/usrp3/lib/sim/arm_deframer/arm_deframer_tb.sv b/fpga/usrp3/lib/sim/arm_deframer/arm_deframer_tb.sv index 4e252b5b4..5e879c3e4 100644 --- a/fpga/usrp3/lib/sim/arm_deframer/arm_deframer_tb.sv +++ b/fpga/usrp3/lib/sim/arm_deframer/arm_deframer_tb.sv @@ -14,8 +14,8 @@ `define NUM_TEST_CASES 3 `include "sim_axis_lib.svh" `include "sim_exec_report.vh" -`include "sim_rfnoc_lib.svh" `include "sim_set_rb_lib.svh" +`include "sim_clks_rsts.vh" // NOTE: The tesbench is not self-checking module arm_deframer_tb(); |