bslathi19/taxi
1
0
Fork 0
mirror of https://github.com/fpganinja/taxi.git synced 2025-12-07 16:28:40 -08:00
Code Issues Packages Projects Releases Wiki Activity

eth: Use tie and null_src modules

Browse Source 
Signed-off-by: Alex Forencich <alex@alexforencich.com>
This commit is contained in:
Alex Forencich
2025-11-06 09:35:26 -08:00
parent c6eac348f6
commit 434f31887e
6 changed files with 69 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/eth/rtl/taxi_eth_mac_10g.f
View File

@@ -10,4 +10,6 @@ taxi_mac_pause_ctrl_tx.sv
taxi_mac_pause_ctrl_rx.sv taxi_mac_pause_ctrl_rx.sv
../lib/taxi/src/lfsr/rtl/taxi_lfsr.sv ../lib/taxi/src/lfsr/rtl/taxi_lfsr.sv
../lib/taxi/src/axis/rtl/taxi_axis_if.sv ../lib/taxi/src/axis/rtl/taxi_axis_if.sv
../lib/taxi/src/axis/rtl/taxi_axis_null_src.sv
../lib/taxi/src/axis/rtl/taxi_axis_tie.sv
../lib/taxi/src/sync/rtl/taxi_sync_signal.sv ../lib/taxi/src/sync/rtl/taxi_sync_signal.sv

36
src/eth/rtl/taxi_eth_mac_10g.sv
View File

@@ -544,13 +544,10 @@ if (STAT_EN) begin : stats
end else begin end else begin
assign m_axis_stat.tdata = '0; taxi_axis_null_src
assign m_axis_stat.tkeep = '0; null_src_inst (
assign m_axis_stat.tlast = '0; .m_axis(m_axis_stat)
assign m_axis_stat.tvalid = '0; );
assign m_axis_stat.tid = '0;
assign m_axis_stat.tdest = '0;
assign m_axis_stat.tuser = '0;
end end
@@ -827,22 +824,17 @@ if (MAC_CTRL_EN) begin : mac_ctrl
end else begin end else begin
assign axis_tx_int.tdata = s_axis_tx.tdata; taxi_axis_tie
assign axis_tx_int.tkeep = s_axis_tx.tkeep; tx_tie_inst (
assign axis_tx_int.tvalid = s_axis_tx.tvalid; .s_axis(s_axis_tx),
assign s_axis_tx.tready = axis_tx_int.tready; .m_axis(axis_tx_int)
assign axis_tx_int.tlast = s_axis_tx.tlast; );
assign axis_tx_int.tid = s_axis_tx.tid;
assign axis_tx_int.tdest = s_axis_tx.tdest;
assign axis_tx_int.tuser = s_axis_tx.tuser;
assign m_axis_rx.tdata = axis_rx_int.tdata; taxi_axis_tie
assign m_axis_rx.tkeep = axis_rx_int.tkeep; rx_tie_inst (
assign m_axis_rx.tvalid = axis_rx_int.tvalid; .s_axis(axis_rx_int),
assign m_axis_rx.tlast = axis_rx_int.tlast; .m_axis(m_axis_rx)
assign m_axis_rx.tid = axis_rx_int.tid; );
assign m_axis_rx.tdest = axis_rx_int.tdest;
assign m_axis_rx.tuser = axis_rx_int.tuser;
assign rx_lfc_req = '0; assign rx_lfc_req = '0;
assign rx_pfc_req = '0; assign rx_pfc_req = '0;

2
src/eth/rtl/taxi_eth_mac_1g.f
View File

@@ -8,4 +8,6 @@ taxi_mac_pause_ctrl_tx.sv
taxi_mac_pause_ctrl_rx.sv taxi_mac_pause_ctrl_rx.sv
../lib/taxi/src/lfsr/rtl/taxi_lfsr.sv ../lib/taxi/src/lfsr/rtl/taxi_lfsr.sv
../lib/taxi/src/axis/rtl/taxi_axis_if.sv ../lib/taxi/src/axis/rtl/taxi_axis_if.sv
../lib/taxi/src/axis/rtl/taxi_axis_null_src.sv
../lib/taxi/src/axis/rtl/taxi_axis_tie.sv
../lib/taxi/src/sync/rtl/taxi_sync_signal.sv ../lib/taxi/src/sync/rtl/taxi_sync_signal.sv

36
src/eth/rtl/taxi_eth_mac_1g.sv
View File

@@ -404,13 +404,10 @@ if (STAT_EN) begin : stats
end else begin end else begin
assign m_axis_stat.tdata = '0; taxi_axis_null_src
assign m_axis_stat.tkeep = '0; null_src_inst (
assign m_axis_stat.tlast = '0; .m_axis(m_axis_stat)
assign m_axis_stat.tvalid = '0; );
assign m_axis_stat.tid = '0;
assign m_axis_stat.tdest = '0;
assign m_axis_stat.tuser = '0;
end end
@@ -687,22 +684,17 @@ if (MAC_CTRL_EN) begin : mac_ctrl
end else begin end else begin
assign axis_tx_int.tdata = s_axis_tx.tdata; taxi_axis_tie
assign axis_tx_int.tkeep = s_axis_tx.tkeep; tx_tie_inst (
assign axis_tx_int.tvalid = s_axis_tx.tvalid; .s_axis(s_axis_tx),
assign s_axis_tx.tready = axis_tx_int.tready; .m_axis(axis_tx_int)
assign axis_tx_int.tlast = s_axis_tx.tlast; );
assign axis_tx_int.tid = s_axis_tx.tid;
assign axis_tx_int.tdest = s_axis_tx.tdest;
assign axis_tx_int.tuser = s_axis_tx.tuser;
assign m_axis_rx.tdata = axis_rx_int.tdata; taxi_axis_tie
assign m_axis_rx.tkeep = axis_rx_int.tkeep; rx_tie_inst (
assign m_axis_rx.tvalid = axis_rx_int.tvalid; .s_axis(axis_rx_int),
assign m_axis_rx.tlast = axis_rx_int.tlast; .m_axis(m_axis_rx)
assign m_axis_rx.tid = axis_rx_int.tid; );
assign m_axis_rx.tdest = axis_rx_int.tdest;
assign m_axis_rx.tuser = axis_rx_int.tuser;
assign rx_lfc_req = '0; assign rx_lfc_req = '0;
assign rx_pfc_req = '0; assign rx_pfc_req = '0;

2
src/eth/rtl/taxi_eth_mac_phy_10g.f
View File

@@ -6,4 +6,6 @@ taxi_mac_ctrl_tx.sv
taxi_mac_ctrl_rx.sv taxi_mac_ctrl_rx.sv
taxi_mac_pause_ctrl_tx.sv taxi_mac_pause_ctrl_tx.sv
taxi_mac_pause_ctrl_rx.sv taxi_mac_pause_ctrl_rx.sv
../lib/taxi/src/axis/rtl/taxi_axis_null_src.sv
../lib/taxi/src/axis/rtl/taxi_axis_tie.sv
../lib/taxi/src/sync/rtl/taxi_sync_signal.sv ../lib/taxi/src/sync/rtl/taxi_sync_signal.sv

78
src/eth/rtl/taxi_eth_mac_phy_10g.sv
View File

@@ -442,13 +442,10 @@ if (STAT_EN) begin : stats
end else begin end else begin
assign m_axis_stat.tdata = '0; taxi_axis_null_src
assign m_axis_stat.tkeep = '0; null_src_inst (
assign m_axis_stat.tlast = '0; .m_axis(m_axis_stat)
assign m_axis_stat.tvalid = '0; );
assign m_axis_stat.tid = '0;
assign m_axis_stat.tdest = '0;
assign m_axis_stat.tuser = '0;
end end
@@ -725,45 +722,40 @@ if (MAC_CTRL_EN) begin : mac_ctrl
end else begin end else begin
assign axis_tx_int.tdata = s_axis_tx.tdata; taxi_axis_tie
assign axis_tx_int.tkeep = s_axis_tx.tkeep; tx_tie_inst (
assign axis_tx_int.tvalid = s_axis_tx.tvalid; .s_axis(s_axis_tx),
assign s_axis_tx.tready = axis_tx_int.tready; .m_axis(axis_tx_int)
assign axis_tx_int.tlast = s_axis_tx.tlast; );
assign axis_tx_int.tid = s_axis_tx.tid;
assign axis_tx_int.tdest = s_axis_tx.tdest;
assign axis_tx_int.tuser = s_axis_tx.tuser;
assign m_axis_rx.tdata = axis_rx_int.tdata; taxi_axis_tie
assign m_axis_rx.tkeep = axis_rx_int.tkeep; rx_tie_inst (
assign m_axis_rx.tvalid = axis_rx_int.tvalid; .s_axis(axis_rx_int),
assign m_axis_rx.tlast = axis_rx_int.tlast; .m_axis(m_axis_rx)
assign m_axis_rx.tid = axis_rx_int.tid; );
assign m_axis_rx.tdest = axis_rx_int.tdest;
assign m_axis_rx.tuser = axis_rx_int.tuser;
assign rx_lfc_req = 0; assign rx_lfc_req = '0;
assign rx_pfc_req = 0; assign rx_pfc_req = '0;
assign tx_pause_ack = 0; assign tx_pause_ack = '0;
assign stat_tx_mcf = 0; assign stat_tx_mcf = '0;
assign stat_rx_mcf = 0; assign stat_rx_mcf = '0;
assign stat_tx_lfc_pkt = 0; assign stat_tx_lfc_pkt = '0;
assign stat_tx_lfc_xon = 0; assign stat_tx_lfc_xon = '0;
assign stat_tx_lfc_xoff = 0; assign stat_tx_lfc_xoff = '0;
assign stat_tx_lfc_paused = 0; assign stat_tx_lfc_paused = '0;
assign stat_tx_pfc_pkt = 0; assign stat_tx_pfc_pkt = '0;
assign stat_tx_pfc_xon = 0; assign stat_tx_pfc_xon = '0;
assign stat_tx_pfc_xoff = 0; assign stat_tx_pfc_xoff = '0;
assign stat_tx_pfc_paused = 0; assign stat_tx_pfc_paused = '0;
assign stat_rx_lfc_pkt = 0; assign stat_rx_lfc_pkt = '0;
assign stat_rx_lfc_xon = 0; assign stat_rx_lfc_xon = '0;
assign stat_rx_lfc_xoff = 0; assign stat_rx_lfc_xoff = '0;
assign stat_rx_lfc_paused = 0; assign stat_rx_lfc_paused = '0;
assign stat_rx_pfc_pkt = 0; assign stat_rx_pfc_pkt = '0;
assign stat_rx_pfc_xon = 0; assign stat_rx_pfc_xon = '0;
assign stat_rx_pfc_xoff = 0; assign stat_rx_pfc_xoff = '0;
assign stat_rx_pfc_paused = 0; assign stat_rx_pfc_paused = '0;
end end