diff --git a/library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac.v b/library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac.v index 3f494b366..4f1c1f7b3 100644 --- a/library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac.v +++ b/library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac.v @@ -30,6 +30,7 @@ module ad_ip_jesd204_tpl_dac #( parameter SAMPLES_PER_FRAME = 1, parameter CONVERTER_RESOLUTION = 16, parameter BITS_PER_SAMPLE = 16, + parameter OCTETS_PER_BEAT = 4, parameter DDS_TYPE = 1, parameter DDS_CORDIC_DW = 16, parameter DDS_CORDIC_PHASE_DW = 16, @@ -41,13 +42,13 @@ module ad_ip_jesd204_tpl_dac #( input link_clk, output link_valid, input link_ready, - output [NUM_LANES*32-1:0] link_data, + output [NUM_LANES*8*OCTETS_PER_BEAT-1:0] link_data, // dma interface output [NUM_CHANNELS-1:0] enable, output [NUM_CHANNELS-1:0] dac_valid, - input [NUM_LANES*32-1:0] dac_ddata, + input [NUM_LANES*8*OCTETS_PER_BEAT-1:0] dac_ddata, input dac_dunf, // axi interface @@ -80,9 +81,6 @@ module ad_ip_jesd204_tpl_dac #( output [1:0] s_axi_rresp ); - /* Static for now */ - localparam OCTETS_PER_BEAT = 4; - localparam DATA_PATH_WIDTH = OCTETS_PER_BEAT * 8 * NUM_LANES / NUM_CHANNELS / BITS_PER_SAMPLE; localparam LINK_DATA_WIDTH = NUM_LANES * OCTETS_PER_BEAT * 8; localparam DMA_DATA_WIDTH = 16 * DATA_PATH_WIDTH * NUM_CHANNELS; diff --git a/library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac_ip.tcl b/library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac_ip.tcl index abd54d900..ef4544810 100644 --- a/library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac_ip.tcl +++ b/library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac_ip.tcl @@ -90,6 +90,7 @@ foreach {p v} { "BITS_PER_SAMPLE" "12 16" \ "CONVERTER_RESOLUTION" "11 12 16" \ "SAMPLES_PER_FRAME" "1 2 3 4 6 8 12 16" \ + "OCTETS_PER_BEAT" "4 8" \ } { \ set_property -dict [list \ "value_validation_type" "list" \ @@ -119,6 +120,7 @@ foreach {k v} { \ "BITS_PER_SAMPLE" "Bits per Sample (N')" \ "CONVERTER_RESOLUTION" "Converter Resolution (N)" \ "SAMPLES_PER_FRAME" "Samples per Frame (S)" \ + "OCTETS_PER_BEAT" "Octets per Beat" \ } { \ set p [ipgui::get_guiparamspec -name $k -component $cc] ipgui::move_param -component $cc -order $i $p -parent $framer_group