diff options
author | Wade Fife <wade.fife@ettus.com> | 2022-02-28 14:54:42 -0600 |
---|---|---|
committer | Wade Fife <wade.fife@ettus.com> | 2022-03-04 09:42:39 -0600 |
commit | 6ff8bd326b0da4d2f9e044a3df3e19b807459d25 (patch) | |
tree | d11cf3c96e053cd98a620e764d5102952659a395 /fpga/usrp3 | |
parent | a6f666092a21c689d36e113b4999ee970e960c9a (diff) | |
download | uhd-6ff8bd326b0da4d2f9e044a3df3e19b807459d25.tar.gz uhd-6ff8bd326b0da4d2f9e044a3df3e19b807459d25.tar.bz2 uhd-6ff8bd326b0da4d2f9e044a3df3e19b807459d25.zip |
fpga: rfnoc: Regenerate noc_shells
Diffstat (limited to 'fpga/usrp3')
18 files changed, 47 insertions, 29 deletions
diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_addsub/noc_shell_addsub.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_addsub/noc_shell_addsub.v index ae21cb308..67b2237f4 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_addsub/noc_shell_addsub.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_addsub/noc_shell_addsub.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -165,12 +166,12 @@ module noc_shell_addsub #( wire ce_rst_pulse; - pulse_synchronizer #(.MODE ("POSEDGE")) pulse_synchronizer_ce_clk ( + pulse_synchronizer #(.MODE ("POSEDGE")) pulse_synchronizer_ce ( .clk_a(rfnoc_chdr_clk), .rst_a(1'b0), .pulse_a (rfnoc_chdr_rst), .busy_a (), .clk_b(ce_clk), .pulse_b (ce_rst_pulse) ); - pulse_stretch_min #(.LENGTH(32)) pulse_stretch_min_ce_clk ( + pulse_stretch_min #(.LENGTH(32)) pulse_stretch_min_ce ( .clk(ce_clk), .rst(1'b0), .pulse_in(ce_rst_pulse), .pulse_out(ce_rst) ); diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_axi_ram_fifo/noc_shell_axi_ram_fifo.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_axi_ram_fifo/noc_shell_axi_ram_fifo.v index 539622831..a3a9ed186 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_axi_ram_fifo/noc_shell_axi_ram_fifo.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_axi_ram_fifo/noc_shell_axi_ram_fifo.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_ddc/noc_shell_ddc.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_ddc/noc_shell_ddc.v index a4874114f..f4cd87abb 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_ddc/noc_shell_ddc.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_ddc/noc_shell_ddc.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -234,7 +235,7 @@ module noc_shell_ddc #( .NIPC (1), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)) + .PYLD_FIFO_SIZE ($clog2(32)) ) chdr_to_axis_data_in_in ( .axis_chdr_clk (rfnoc_chdr_clk), .axis_chdr_rst (rfnoc_chdr_rst), @@ -272,7 +273,7 @@ module noc_shell_ddc #( .NIPC (1), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)), + .PYLD_FIFO_SIZE ($clog2(2**MTU)), .MTU (MTU), .SIDEBAND_AT_END (1) ) axis_data_to_chdr_out_out ( diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_duc/noc_shell_duc.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_duc/noc_shell_duc.v index 5645a2442..ef5231ed7 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_duc/noc_shell_duc.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_duc/noc_shell_duc.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -234,7 +235,7 @@ module noc_shell_duc #( .NIPC (1), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)) + .PYLD_FIFO_SIZE ($clog2(32)) ) chdr_to_axis_data_in_in ( .axis_chdr_clk (rfnoc_chdr_clk), .axis_chdr_rst (rfnoc_chdr_rst), @@ -272,7 +273,7 @@ module noc_shell_duc #( .NIPC (1), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)), + .PYLD_FIFO_SIZE ($clog2(2**MTU)), .MTU (MTU), .SIDEBAND_AT_END (1) ) axis_data_to_chdr_out_out ( diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fft/noc_shell_fft.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fft/noc_shell_fft.v index 31c2f320a..96e3dbdd1 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fft/noc_shell_fft.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fft/noc_shell_fft.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fir_filter/noc_shell_fir_filter.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fir_filter/noc_shell_fir_filter.v index 8614f0f29..a95946379 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fir_filter/noc_shell_fir_filter.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fir_filter/noc_shell_fir_filter.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fosphor/noc_shell_fosphor.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fosphor/noc_shell_fosphor.v index 1eecf3a0a..c2ff06ce2 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fosphor/noc_shell_fosphor.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_fosphor/noc_shell_fosphor.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_keep_one_in_n/noc_shell_keep_one_in_n.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_keep_one_in_n/noc_shell_keep_one_in_n.v index c3fd16bc7..6f372f0aa 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_keep_one_in_n/noc_shell_keep_one_in_n.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_keep_one_in_n/noc_shell_keep_one_in_n.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -269,7 +270,7 @@ module noc_shell_keep_one_in_n #( .NIPC (1), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)), + .PYLD_FIFO_SIZE ($clog2(2**MTU)), .MTU (MTU), .SIDEBAND_AT_END (1) ) axis_data_to_chdr_out_out ( diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_logpwr/noc_shell_logpwr.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_logpwr/noc_shell_logpwr.v index 434793ffd..af23f3e69 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_logpwr/noc_shell_logpwr.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_logpwr/noc_shell_logpwr.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_moving_avg/noc_shell_moving_avg.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_moving_avg/noc_shell_moving_avg.v index c44d28eea..0972d4453 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_moving_avg/noc_shell_moving_avg.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_moving_avg/noc_shell_moving_avg.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_null_src_sink/noc_shell_null_src_sink.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_null_src_sink/noc_shell_null_src_sink.v index 177b58af2..ca6d423c5 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_null_src_sink/noc_shell_null_src_sink.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_null_src_sink/noc_shell_null_src_sink.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_radio/noc_shell_radio.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_radio/noc_shell_radio.v index 5909e0e39..da0d7d0f4 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_radio/noc_shell_radio.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_radio/noc_shell_radio.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -250,7 +251,7 @@ module noc_shell_radio #( .NIPC (NIPC), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)) + .PYLD_FIFO_SIZE ($clog2(2**MTU)) ) chdr_to_axis_data_in_in ( .axis_chdr_clk (rfnoc_chdr_clk), .axis_chdr_rst (rfnoc_chdr_rst), @@ -288,7 +289,7 @@ module noc_shell_radio #( .NIPC (NIPC), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)), + .PYLD_FIFO_SIZE ($clog2(2**(MTU+1))), .MTU (MTU), .SIDEBAND_AT_END (1) ) axis_data_to_chdr_out_out ( diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_replay/noc_shell_replay.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_replay/noc_shell_replay.v index 51f018b99..c1a5558b4 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_replay/noc_shell_replay.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_replay/noc_shell_replay.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none @@ -233,7 +234,7 @@ module noc_shell_replay #( .NIPC (MEM_DATA_W/32), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)) + .PYLD_FIFO_SIZE ($clog2(32)) ) chdr_to_axis_data_in_in ( .axis_chdr_clk (rfnoc_chdr_clk), .axis_chdr_rst (rfnoc_chdr_rst), @@ -271,7 +272,7 @@ module noc_shell_replay #( .NIPC (MEM_DATA_W/32), .SYNC_CLKS (0), .INFO_FIFO_SIZE ($clog2(32)), - .PYLD_FIFO_SIZE ($clog2(MTU)), + .PYLD_FIFO_SIZE ($clog2(2**MTU)), .MTU (MTU), .SIDEBAND_AT_END (1) ) axis_data_to_chdr_out_out ( diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_siggen/noc_shell_siggen.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_siggen/noc_shell_siggen.v index 4e8b99e98..5dca06614 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_siggen/noc_shell_siggen.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_siggen/noc_shell_siggen.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_split_stream/noc_shell_split_stream.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_split_stream/noc_shell_split_stream.v index 8d6c1ebff..4f57ec985 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_split_stream/noc_shell_split_stream.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_split_stream/noc_shell_split_stream.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_switchboard/noc_shell_switchboard.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_switchboard/noc_shell_switchboard.v index 2beb37ef3..88d16b7fe 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_switchboard/noc_shell_switchboard.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_switchboard/noc_shell_switchboard.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_vector_iir/noc_shell_vector_iir.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_vector_iir/noc_shell_vector_iir.v index fd80ac71d..2c3263e65 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_vector_iir/noc_shell_vector_iir.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_vector_iir/noc_shell_vector_iir.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // `default_nettype none diff --git a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_window/noc_shell_window.v b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_window/noc_shell_window.v index 7855d1ee8..6ec180313 100644 --- a/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_window/noc_shell_window.v +++ b/fpga/usrp3/lib/rfnoc/blocks/rfnoc_block_window/noc_shell_window.v @@ -1,5 +1,5 @@ // -// Copyright 2021 Ettus Research, a National Instruments Brand +// Copyright 2022 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: LGPL-3.0-or-later // @@ -15,6 +15,7 @@ // THIS_PORTID : Control crossbar port to which this block is connected // CHDR_W : AXIS-CHDR data bus width // MTU : Maximum transmission unit (i.e., maximum packet size in +// CHDR words is 2**MTU). // NUM_PORTS : Number of window module instances to connect // |