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

util_upack: Fixed ip

main
Adrian Costina 2015-03-19 16:22:12 +02:00
parent 8542c2b0d7
commit 7e15fd9e5b
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/util_upack/util_upack.v
View File

@ -176,11 +176,11 @@ module util_upack (
generate
if (P_CNT < M_CNT) begin
for (n = P_CNT; n < M_CNT; n = n + 1) begin: g_def
assign dac_dsf_valid_s[n] = 'd0;
assign dac_dsf_sync_s[n] = 'd0;
assign dac_dsf_data_s[n] = 'd0;
end
for (n = P_CNT; n < M_CNT; n = n + 1) begin: g_def
assign dac_dsf_valid_s[n] = 'd0;
assign dac_dsf_sync_s[n] = 'd0;
assign dac_dsf_data_s[n] = 'd0;
end
end
for (n = 0; n < P_CNT; n = n + 1) begin: g_dsf

14
library/util_upack/util_upack_dsf.v
View File

@ -102,6 +102,16 @@ module util_upack_dsf (
// bypass
genvar i;
generate
if (CH_OCNT == P_CNT) begin
for (i = 0; i < CH_SCNT ; i = i +1) begin
assign dac_dsf_data_s[(((i +1) * M_CNT * 16)-1):(i*M_CNT*16)] =
dac_data[(((i+1)*16*P_CNT)-1): (i*16*P_CNT)];
end
end
endgenerate
generate
if (CH_OCNT == P_CNT) begin
@ -109,8 +119,6 @@ module util_upack_dsf (
assign dac_data_s = 'd0;
assign dac_data_int_0_s = 'd0;
assign dac_data_int_1_s = 'd0;
assign dac_dsf_data_s[M_WIDTH:P_WIDTH] = 'd0;
assign dac_dsf_data_s[(P_WIDTH-1):0] = dac_data;
always @(posedge dac_clk) begin
dac_dmx_valid <= dac_valid & dac_dmx_enable;
@ -165,7 +173,7 @@ module util_upack_dsf (
dac_data_int[(M_WIDTH-1):(M_WIDTH-(E_WIDTH-P_WIDTH))];
assign dac_data_int_1_s[(E_WIDTH-1):(E_WIDTH-(M_WIDTH-O_WIDTH))] =
dac_data_int[((M_WIDTH-O_WIDTH)-1):0];
dac_data_int[(M_WIDTH-1):O_WIDTH];
assign dac_data_int_1_s[((E_WIDTH-(M_WIDTH-O_WIDTH))-1):0] = 'd0;
always @(posedge dac_clk) begin