zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jesd204/ad_ip_jesd204_tpl_dac: Updates for ad_dds phase acc wrapper

main
AndreiGrozav 2018-06-06 14:11:24 +03:00 committed by AndreiGrozav
parent 528460371c
commit 92f0e809b5
6 changed files with 49 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/jesd204/ad_ip_jesd204_tpl_dac/Makefile
View File

@ -7,7 +7,10 @@ LIBRARY_NAME := ad_ip_jesd204_tpl_dac
GENERIC_DEPS += ../../common/ad_dds.v GENERIC_DEPS += ../../common/ad_dds.v
GENERIC_DEPS += ../../common/ad_dds_1.v GENERIC_DEPS += ../../common/ad_dds_1.v
GENERIC_DEPS += ../../common/ad_dds_2.v
GENERIC_DEPS += ../../common/ad_dds_cordic_pipe.v
GENERIC_DEPS += ../../common/ad_dds_sine.v GENERIC_DEPS += ../../common/ad_dds_sine.v
GENERIC_DEPS += ../../common/ad_dds_sine_cordic.v
GENERIC_DEPS += ../../common/ad_rst.v GENERIC_DEPS += ../../common/ad_rst.v
GENERIC_DEPS += ../../common/up_axi.v GENERIC_DEPS += ../../common/up_axi.v
GENERIC_DEPS += ../../common/up_clock_mon.v GENERIC_DEPS += ../../common/up_clock_mon.v

8
library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac.v
View File

@ -28,6 +28,9 @@ module ad_ip_jesd204_tpl_dac #(
parameter NUM_LANES = 4, parameter NUM_LANES = 4,
parameter NUM_CHANNELS = 2, parameter NUM_CHANNELS = 2,
parameter CHANNEL_WIDTH = 16, parameter CHANNEL_WIDTH = 16,
parameter DAC_DDS_TYPE = 1,
parameter DAC_DDS_CORDIC_DW = 16,
parameter DAC_DDS_CORDIC_PHASE_DW = 16,
parameter DAC_DATAPATH_DISABLE = 0 parameter DAC_DATAPATH_DISABLE = 0
) ( ) (
// jesd interface // jesd interface
@ -146,7 +149,10 @@ module ad_ip_jesd204_tpl_dac #(
.DATAPATH_DISABLE (DAC_DATAPATH_DISABLE), .DATAPATH_DISABLE (DAC_DATAPATH_DISABLE),
.NUM_LANES (NUM_LANES), .NUM_LANES (NUM_LANES),
.NUM_CHANNELS (NUM_CHANNELS), .NUM_CHANNELS (NUM_CHANNELS),
.DATA_PATH_WIDTH (DATA_PATH_WIDTH) .DATA_PATH_WIDTH (DATA_PATH_WIDTH),
.DAC_DDS_TYPE (DAC_DDS_TYPE),
.DAC_DDS_CORDIC_DW (DAC_DDS_CORDIC_DW),
.DAC_DDS_CORDIC_PHASE_DW (DAC_DDS_CORDIC_PHASE_DW)
) i_core ( ) i_core (
.clk (link_clk), .clk (link_clk),

76
library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac_channel.v
View File

@ -25,7 +25,10 @@
module ad_ip_jesd204_tpl_dac_channel #( module ad_ip_jesd204_tpl_dac_channel #(
parameter DATAPATH_DISABLE = 0, parameter DATAPATH_DISABLE = 0,
parameter DATA_PATH_WIDTH = 4 parameter DATA_PATH_WIDTH = 4,
parameter DAC_DDS_TYPE = 1,
parameter DAC_DDS_CORDIC_DW = 16,
parameter DAC_DDS_CORDIC_PHASE_DW = 16
) ( ) (
// dac interface // dac interface
@ -62,7 +65,6 @@ module ad_ip_jesd204_tpl_dac_channel #(
reg [DW:0] dac_pn15_data = 'd0; reg [DW:0] dac_pn15_data = 'd0;
reg [15:0] dac_dds_phase_0[0:DATA_PATH_WIDTH-1]; reg [15:0] dac_dds_phase_0[0:DATA_PATH_WIDTH-1];
reg [15:0] dac_dds_phase_1[0:DATA_PATH_WIDTH-1]; reg [15:0] dac_dds_phase_1[0:DATA_PATH_WIDTH-1];
reg [DW:0] dac_dds_data = 'd0;
// internal signals // internal signals
@ -106,7 +108,7 @@ module ad_ip_jesd204_tpl_dac_channel #(
4'h3: dac_data <= 'h00; 4'h3: dac_data <= 'h00;
4'h2: dac_data <= dma_data; 4'h2: dac_data <= dma_data;
4'h1: dac_data <= {DATA_PATH_WIDTH/2{dac_pat_data_1, dac_pat_data_0}}; 4'h1: dac_data <= {DATA_PATH_WIDTH/2{dac_pat_data_1, dac_pat_data_0}};
default: dac_data <= dac_dds_data; default: dac_data <= dac_dds_data_s;
endcase endcase
end end
@ -124,55 +126,25 @@ module ad_ip_jesd204_tpl_dac_channel #(
// dds // dds
generate ad_dds #(
if (DATAPATH_DISABLE == 1) begin .DISABLE (DATAPATH_DISABLE),
always @(posedge clk) begin .DDS_DW (16),
dac_dds_data <= 64'd0; .PHASE_DW (16),
end .DDS_TYPE (DAC_DDS_TYPE),
end else begin .CORDIC_DW (DAC_DDS_CORDIC_DW),
genvar i; .CORDIC_PHASE_DW (DAC_DDS_CORDIC_PHASE_DW),
.CLK_RATIO (DATA_PATH_WIDTH))
always @(posedge clk) begin i_dds (
if (dac_data_sync == 1'b1) begin
dac_dds_data <= 64'd0;
end else begin
dac_dds_data <= dac_dds_data_s;
end
end
for (i = 0; i < DATA_PATH_WIDTH; i = i + 1) begin: g_dds_phase
reg [15:0] dac_dds_incr_0_r = 'd0;
reg [15:0] dac_dds_incr_1_r = 'd0;
always @(posedge clk) begin
if (dac_data_sync == 1'b1) begin
dac_dds_incr_0_r <= dac_dds_incr_0 * DATA_PATH_WIDTH;
dac_dds_incr_1_r <= dac_dds_incr_1 * DATA_PATH_WIDTH;
if (i == 0) begin
dac_dds_phase_0[i] <= dac_dds_init_0;
dac_dds_phase_1[i] <= dac_dds_init_1;
end else begin
dac_dds_phase_0[i] <= dac_dds_phase_0[i-1] + dac_dds_incr_0;
dac_dds_phase_1[i] <= dac_dds_phase_1[i-1] + dac_dds_incr_1;
end
end else begin
dac_dds_phase_0[i] <= dac_dds_phase_0[i] + dac_dds_incr_0_r;
dac_dds_phase_1[i] <= dac_dds_phase_1[i] + dac_dds_incr_1_r;
end
end
ad_dds i_dds (
.clk (clk), .clk (clk),
.dds_format (dac_dds_format), .dac_dds_format (dac_dds_format),
.dds_phase_0 (dac_dds_phase_0[i]), .dac_data_sync (dac_data_sync),
.dds_scale_0 (dac_dds_scale_0), .dac_valid (1'b1),
.dds_phase_1 (dac_dds_phase_1[i]), .tone_1_scale (dac_dds_scale_0),
.dds_scale_1 (dac_dds_scale_1), .tone_2_scale (dac_dds_scale_1),
.dds_data (dac_dds_data_s[16*i+:16]) .tone_1_init_offset (dac_dds_init_0),
); .tone_2_init_offset (dac_dds_init_1),
end .tone_1_freq_word (dac_dds_incr_0),
end .tone_2_freq_word (dac_dds_incr_1),
endgenerate .dac_dds_data (dac_dds_data_s));
endmodule endmodule

10
library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac_core.v
View File

@ -27,7 +27,10 @@ module ad_ip_jesd204_tpl_dac_core #(
parameter DATAPATH_DISABLE = 0, parameter DATAPATH_DISABLE = 0,
parameter NUM_LANES = 1, parameter NUM_LANES = 1,
parameter NUM_CHANNELS = 1, parameter NUM_CHANNELS = 1,
parameter DATA_PATH_WIDTH = 4 parameter DATA_PATH_WIDTH = 4,
parameter DAC_DDS_TYPE = 1,
parameter DAC_DDS_CORDIC_DW = 16,
parameter DAC_DDS_CORDIC_PHASE_DW = 16
) ( ) (
// dac interface // dac interface
input clk, input clk,
@ -86,7 +89,10 @@ module ad_ip_jesd204_tpl_dac_core #(
for (i = 0; i < NUM_CHANNELS; i = i + 1) begin: g_channel for (i = 0; i < NUM_CHANNELS; i = i + 1) begin: g_channel
ad_ip_jesd204_tpl_dac_channel #( ad_ip_jesd204_tpl_dac_channel #(
.DATA_PATH_WIDTH (DATA_PATH_WIDTH), .DATA_PATH_WIDTH (DATA_PATH_WIDTH),
.DATAPATH_DISABLE (DATAPATH_DISABLE) .DATAPATH_DISABLE (DATAPATH_DISABLE),
.DAC_DDS_TYPE (DAC_DDS_TYPE),
.DAC_DDS_CORDIC_DW (DAC_DDS_CORDIC_DW),
.DAC_DDS_CORDIC_PHASE_DW (DAC_DDS_CORDIC_PHASE_DW)
) i_channel ( ) i_channel (
.clk (clk), .clk (clk),
.dac_enable (enable[i]), .dac_enable (enable[i]),

3
library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac_hw.tcl
View File

@ -29,6 +29,9 @@ ad_ip_create ad_ip_jesd204_tpl_dac {ADI JESD204 Transport DAC Layer} p_ad_ip_jes
ad_ip_files ad_ip_jesd204_tpl_dac [list \ ad_ip_files ad_ip_jesd204_tpl_dac [list \
$ad_hdl_dir/library/altera/common/ad_mul.v \ $ad_hdl_dir/library/altera/common/ad_mul.v \
$ad_hdl_dir/library/common/ad_dds_sine.v \ $ad_hdl_dir/library/common/ad_dds_sine.v \
$ad_hdl_dir/library/common/ad_dds_cordic_pipe.v \
$ad_hdl_dir/library/common/ad_dds_sine_cordic.v \
$ad_hdl_dir/library/common/ad_dds_2.v \
$ad_hdl_dir/library/common/ad_dds_1.v \ $ad_hdl_dir/library/common/ad_dds_1.v \
$ad_hdl_dir/library/common/ad_dds.v \ $ad_hdl_dir/library/common/ad_dds.v \
$ad_hdl_dir/library/common/ad_rst.v \ $ad_hdl_dir/library/common/ad_rst.v \

3
library/jesd204/ad_ip_jesd204_tpl_dac/ad_ip_jesd204_tpl_dac_ip.tcl
View File

@ -28,6 +28,9 @@ adi_ip_create ad_ip_jesd204_tpl_dac
adi_ip_files ad_ip_jesd204_tpl_dac [list \ adi_ip_files ad_ip_jesd204_tpl_dac [list \
"$ad_hdl_dir/library/xilinx/common/ad_mul.v" \ "$ad_hdl_dir/library/xilinx/common/ad_mul.v" \
"$ad_hdl_dir/library/common/ad_dds_sine.v" \ "$ad_hdl_dir/library/common/ad_dds_sine.v" \
"$ad_hdl_dir/library/common/ad_dds_cordic_pipe.v" \
"$ad_hdl_dir/library/common/ad_dds_sine_cordic.v" \
"$ad_hdl_dir/library/common/ad_dds_2.v" \
"$ad_hdl_dir/library/common/ad_dds_1.v" \ "$ad_hdl_dir/library/common/ad_dds_1.v" \
"$ad_hdl_dir/library/common/ad_dds.v" \ "$ad_hdl_dir/library/common/ad_dds.v" \
"$ad_hdl_dir/library/common/ad_rst.v" \ "$ad_hdl_dir/library/common/ad_rst.v" \