FPGA/corundum
1
0
Fork 0
mirror of https://github.com/corundum/corundum.git synced 2025-02-06 08:38:23 +08:00
Code Issues Projects Releases Wiki Activity

merged changes in eth

Browse Source
This commit is contained in:
Alex Forencich 2019-07-19 18:17:57 -07:00
commit 1917ed3912
2 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fpga/lib/eth/rtl/eth_mac_10g_fifo.v
View File

@ -155,8 +155,8 @@ wire tx_fifo_axis_tready;
wire tx_fifo_axis_tlast; wire tx_fifo_axis_tlast;
wire [TX_USER_WIDTH-1:0] tx_fifo_axis_tuser; wire [TX_USER_WIDTH-1:0] tx_fifo_axis_tuser;
wire [DATA_WIDTH-1:0] tx_axis_tdata_int; wire [AXIS_DATA_WIDTH-1:0] tx_axis_tdata_int;
wire [KEEP_WIDTH-1:0] tx_axis_tkeep_int; wire [AXIS_KEEP_WIDTH-1:0] tx_axis_tkeep_int;
wire tx_axis_tvalid_int; wire tx_axis_tvalid_int;
wire tx_axis_tready_int; wire tx_axis_tready_int;
wire tx_axis_tlast_int; wire tx_axis_tlast_int;
@ -271,8 +271,8 @@ if (TX_PTP_TS_ENABLE) begin
if (TX_PTP_TAG_ENABLE) begin if (TX_PTP_TAG_ENABLE) begin
ptp_tag_insert #( ptp_tag_insert #(
.DATA_WIDTH(DATA_WIDTH), .DATA_WIDTH(AXIS_DATA_WIDTH),
.KEEP_WIDTH(KEEP_WIDTH), .KEEP_WIDTH(AXIS_KEEP_WIDTH),
.TAG_WIDTH(PTP_TAG_WIDTH), .TAG_WIDTH(PTP_TAG_WIDTH),
.TAG_OFFSET(1), .TAG_OFFSET(1),
.USER_WIDTH(TX_USER_WIDTH) .USER_WIDTH(TX_USER_WIDTH)
@ -400,6 +400,7 @@ if (TX_PTP_TS_ENABLE) begin
.m_status_good_frame() .m_status_good_frame()
); );
assign s_axis_tx_ptp_ts_ready = 1'b0;
assign m_axis_tx_ptp_ts_tag = {PTP_TAG_WIDTH{1'b0}}; assign m_axis_tx_ptp_ts_tag = {PTP_TAG_WIDTH{1'b0}};
end end

9
fpga/lib/eth/rtl/eth_mac_phy_10g_fifo.v
View File

@ -169,8 +169,8 @@ wire tx_fifo_axis_tready;
wire tx_fifo_axis_tlast; wire tx_fifo_axis_tlast;
wire [TX_USER_WIDTH-1:0] tx_fifo_axis_tuser; wire [TX_USER_WIDTH-1:0] tx_fifo_axis_tuser;
wire [DATA_WIDTH-1:0] tx_axis_tdata_int; wire [AXIS_DATA_WIDTH-1:0] tx_axis_tdata_int;
wire [KEEP_WIDTH-1:0] tx_axis_tkeep_int; wire [AXIS_KEEP_WIDTH-1:0] tx_axis_tkeep_int;
wire tx_axis_tvalid_int; wire tx_axis_tvalid_int;
wire tx_axis_tready_int; wire tx_axis_tready_int;
wire tx_axis_tlast_int; wire tx_axis_tlast_int;
@ -288,8 +288,8 @@ if (TX_PTP_TS_ENABLE) begin
if (TX_PTP_TAG_ENABLE) begin if (TX_PTP_TAG_ENABLE) begin
ptp_tag_insert #( ptp_tag_insert #(
.DATA_WIDTH(DATA_WIDTH), .DATA_WIDTH(AXIS_DATA_WIDTH),
.KEEP_WIDTH(KEEP_WIDTH), .KEEP_WIDTH(AXIS_KEEP_WIDTH),
.TAG_WIDTH(PTP_TAG_WIDTH), .TAG_WIDTH(PTP_TAG_WIDTH),
.TAG_OFFSET(1), .TAG_OFFSET(1),
.USER_WIDTH(TX_USER_WIDTH) .USER_WIDTH(TX_USER_WIDTH)
@ -417,6 +417,7 @@ if (TX_PTP_TS_ENABLE) begin
.m_status_good_frame() .m_status_good_frame()
); );
assign s_axis_tx_ptp_ts_ready = 1'b0;
assign m_axis_tx_ptp_ts_tag = {PTP_TAG_WIDTH{1'b0}}; assign m_axis_tx_ptp_ts_tag = {PTP_TAG_WIDTH{1'b0}};
end end