playback functions work now
This commit is contained in:
+28
-12
@@ -36,8 +36,8 @@
|
||||
`timescale 1ns/100ps
|
||||
|
||||
module system_raw_eth_top #(
|
||||
parameter FPGA_REVISION_DATE = 32'h05212026,
|
||||
parameter MINOR_REV = 8'h02,
|
||||
parameter FPGA_REVISION_DATE = 32'h06122026,
|
||||
parameter MINOR_REV = 8'h01,
|
||||
parameter TX_JESD_L = 8,
|
||||
parameter TX_NUM_LINKS = 1,
|
||||
parameter RX_JESD_L = 8,
|
||||
@@ -246,7 +246,8 @@ module system_raw_eth_top #(
|
||||
|
||||
wire [127:0] cmac_0_rx_tdata_128b;
|
||||
wire cmac_0_rx_tvalid_128b;
|
||||
|
||||
wire cmac_0_rx_tready_128b;
|
||||
|
||||
////
|
||||
wire [511:0] cmac_4_tx_tdata_512b;
|
||||
wire cmac_4_tx_tvalid_512b;
|
||||
@@ -264,12 +265,12 @@ module system_raw_eth_top #(
|
||||
|
||||
wire [127:0] cmac_4_rx_tdata_128b;
|
||||
wire cmac_4_rx_tvalid_128b;
|
||||
wire cmac_4_rx_tready_128b;
|
||||
|
||||
////
|
||||
wire [255:0] cmac_rx_tdata_256b;
|
||||
wire cmac_rx_tvalid_256b;
|
||||
wire cmac_rx_tready_256b;
|
||||
wire cmac_rx_tready_256b_i;
|
||||
reg [31:0] cmac_rx_tvalid_256b_cnt_r = 32'h0;
|
||||
|
||||
////
|
||||
@@ -398,6 +399,7 @@ module system_raw_eth_top #(
|
||||
wire [127:0] adc_tdata_128b_chan0;
|
||||
wire [127:0] adc_tdata_128b_chan1;
|
||||
|
||||
wire [1:0] cmac_2_dac_chan_sel;
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -856,7 +858,8 @@ module system_raw_eth_top #(
|
||||
assign chan1to4_mode_sel = slv_reg10[12];
|
||||
//assign = slv_reg10[14:13];
|
||||
//assign = slv_reg10[15];
|
||||
//assign = slv_reg10[30:16];
|
||||
assign cmac_2_dac_chan_sel = slv_reg10[17:16];
|
||||
//assign = slv_reg10[30:18];
|
||||
assign playback_path_data_enable_n = slv_reg10[31];
|
||||
|
||||
//ila_5 i_ila_rx (
|
||||
@@ -878,7 +881,7 @@ module system_raw_eth_top #(
|
||||
// .probe14 (cmac_rx_tdata_256b[239:224]), // 16
|
||||
// .probe15 (cmac_rx_tdata_256b[255:240]), // 16
|
||||
// .probe16 (cmac_rx_tvalid_256b), // 1
|
||||
// .probe17 (cmac_rx_tready_256b_i) // 1
|
||||
// .probe17 (cmac_rx_tready_256b) // 1
|
||||
// );
|
||||
|
||||
///////////////////////////////////////////////////////////////
|
||||
@@ -987,7 +990,7 @@ module system_raw_eth_top #(
|
||||
|
||||
.m_axis_tdata (cmac_0_rx_tdata_128b), // out
|
||||
.m_axis_tvalid (cmac_0_rx_tvalid_128b), // out
|
||||
.m_axis_tready (cmac_rx_tready_256b_i) // in
|
||||
.m_axis_tready (cmac_0_rx_tready_128b) // in
|
||||
);
|
||||
|
||||
|
||||
@@ -1099,7 +1102,7 @@ module system_raw_eth_top #(
|
||||
|
||||
.m_axis_tdata (cmac_4_rx_tdata_128b), // out
|
||||
.m_axis_tvalid (cmac_4_rx_tvalid_128b), // out
|
||||
.m_axis_tready (cmac_rx_tready_256b_i) // in
|
||||
.m_axis_tready (cmac_4_rx_tready_128b) // in
|
||||
);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
@@ -1107,11 +1110,24 @@ module system_raw_eth_top #(
|
||||
|
||||
// assign cmac_rx_tdata_256b = {cmac_4_rx_tdata_128b, cmac_0_rx_tdata_128b};
|
||||
// adc_chan1_s3 adc_chan0_s3 //adc_chan1_s2 adc_chan0_s2 adc_chan1_s1 adc_chan0_s1 adc_chan1_s0 adc_chan0_s0
|
||||
assign cmac_rx_tdata_256b = {cmac_4_rx_tdata_128b[127:96], cmac_0_rx_tdata_128b[127:96], cmac_4_rx_tdata_128b[95:64], cmac_0_rx_tdata_128b[95:64], cmac_4_rx_tdata_128b[63:32], cmac_0_rx_tdata_128b[63:32], cmac_4_rx_tdata_128b[31:0], cmac_0_rx_tdata_128b[31:0]};
|
||||
// assign cmac_rx_tdata_256b = {cmac_4_rx_tdata_128b[127:96], cmac_0_rx_tdata_128b[127:96], cmac_4_rx_tdata_128b[95:64], cmac_0_rx_tdata_128b[95:64], cmac_4_rx_tdata_128b[63:32], cmac_0_rx_tdata_128b[63:32], cmac_4_rx_tdata_128b[31:0], cmac_0_rx_tdata_128b[31:0]};
|
||||
|
||||
assign cmac_rx_tvalid_256b = cmac_4_rx_tvalid_128b & cmac_0_rx_tvalid_128b;
|
||||
assign cmac_rx_tready_256b_i = cmac_rx_tvalid_256b & cmac_rx_tready_256b;
|
||||
axis_mux_chan_sel i_axis_mux_chan_sel (
|
||||
.aselect_in (cmac_2_dac_chan_sel),
|
||||
|
||||
.cmac_0_tdata_in (cmac_0_rx_tdata_128b), // in
|
||||
.cmac_0_tvalid_in (cmac_0_rx_tvalid_128b), // in
|
||||
.cmac_0_tready_out (cmac_0_rx_tready_128b), // out
|
||||
|
||||
.cmac_4_tdata_in (cmac_4_rx_tdata_128b), // in
|
||||
.cmac_4_tvalid_in (cmac_4_rx_tvalid_128b), // in
|
||||
.cmac_4_tready_out (cmac_4_rx_tready_128b), // out
|
||||
|
||||
.m_axis_tdata_out (cmac_rx_tdata_256b), // out
|
||||
.m_axis_tvalid_out (cmac_rx_tvalid_256b), // out
|
||||
.m_axis_tready_in (cmac_rx_tready_256b) // in
|
||||
);
|
||||
|
||||
ila_5 i_ila_rx (
|
||||
.clk (tx_device_clk_1),
|
||||
.probe0 (cmac_rx_tdata_256b[15:0]), // 16
|
||||
@@ -1186,7 +1202,7 @@ module system_raw_eth_top #(
|
||||
begin
|
||||
if (tx_device_clk_aresetn == 1'b0 || cnt_reset == 1'b1)
|
||||
cmac_rx_tvalid_256b_cnt_r <= 32'h0;
|
||||
else if (cmac_rx_tvalid_256b == 1'b1 && cmac_rx_tready_256b_i == 1'b1)
|
||||
else if (cmac_rx_tvalid_256b == 1'b1 && (cmac_0_rx_tready_128b || cmac_4_rx_tready_128b) == 1'b1)
|
||||
cmac_rx_tvalid_256b_cnt_r <= cmac_rx_tvalid_256b_cnt_r + 1;
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user