FPGA/verilog-ethernet
1
0
Fork 0
mirror of https://github.com/alexforencich/verilog-ethernet.git synced 2025-01-14 06:43:18 +08:00
Code Issues Projects Releases Wiki Activity

Clean up XGMII symbol generation

Browse Source 
Signed-off-by: Alex Forencich <alex@alexforencich.com>
This commit is contained in:
Alex Forencich 2024-01-28 20:36:06 -08:00
parent 0d3f5fbbc4
commit 13c1872a42
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rtl/axis_xgmii_tx_32.v
View File

@ -328,7 +328,8 @@ always @* begin
s_empty_next = keep2empty(s_axis_tkeep); s_empty_next = keep2empty(s_axis_tkeep);
xgmii_txd_next = {ETH_SFD, {3{ETH_PRE}}}; xgmii_txd_next = {ETH_SFD, {3{ETH_PRE}}};
xgmii_txc_next = 4'b0000; xgmii_txc_next = {CTRL_WIDTH{1'b0}};
s_axis_tready_next = 1'b1; s_axis_tready_next = 1'b1;
start_packet_next = 1'b1; start_packet_next = 1'b1;
state_next = STATE_PAYLOAD; state_next = STATE_PAYLOAD;
@ -345,7 +346,7 @@ always @* begin
end end
xgmii_txd_next = s_tdata_reg; xgmii_txd_next = s_tdata_reg;
xgmii_txc_next = 4'b0000; xgmii_txc_next = {CTRL_WIDTH{1'b0}};
s_tdata_next = s_axis_tdata_masked; s_tdata_next = s_axis_tdata_masked;
s_empty_next = keep2empty(s_axis_tkeep); s_empty_next = keep2empty(s_axis_tkeep);
@ -355,7 +356,7 @@ always @* begin
s_axis_tready_next = 1'b0; s_axis_tready_next = 1'b0;
if (s_axis_tuser[0]) begin if (s_axis_tuser[0]) begin
xgmii_txd_next = {XGMII_TERM, {3{XGMII_ERROR}}}; xgmii_txd_next = {XGMII_TERM, {3{XGMII_ERROR}}};
xgmii_txc_next = 4'b1111; xgmii_txc_next = {CTRL_WIDTH{1'b1}};
ifg_count_next = 8'd10; ifg_count_next = 8'd10;
state_next = STATE_IFG; state_next = STATE_IFG;
end else begin end else begin
@ -381,7 +382,7 @@ always @* begin
end else begin end else begin
// tvalid deassert, fail frame // tvalid deassert, fail frame
xgmii_txd_next = {XGMII_TERM, {3{XGMII_ERROR}}}; xgmii_txd_next = {XGMII_TERM, {3{XGMII_ERROR}}};
xgmii_txc_next = 4'b1111; xgmii_txc_next = {CTRL_WIDTH{1'b1}};
ifg_count_next = 8'd10; ifg_count_next = 8'd10;
error_underflow_next = 1'b1; error_underflow_next = 1'b1;
state_next = STATE_WAIT_END; state_next = STATE_WAIT_END;
@ -438,7 +439,7 @@ always @* begin
s_axis_tready_next = 1'b0; s_axis_tready_next = 1'b0;
xgmii_txd_next = {{3{XGMII_IDLE}}, XGMII_TERM}; xgmii_txd_next = {{3{XGMII_IDLE}}, XGMII_TERM};
xgmii_txc_next = 4'b1111; xgmii_txc_next = {CTRL_WIDTH{1'b1}};
if (ENABLE_DIC) begin if (ENABLE_DIC) begin
if (ifg_count_next > 8'd3) begin if (ifg_count_next > 8'd3) begin
@ -459,6 +460,11 @@ always @* begin
end end
STATE_IFG: begin STATE_IFG: begin
// send IFG // send IFG
// XGMII idle
xgmii_txd_next = {CTRL_WIDTH{XGMII_IDLE}};
xgmii_txc_next = {CTRL_WIDTH{1'b1}};
if (ifg_count_reg > 8'd4) begin if (ifg_count_reg > 8'd4) begin
ifg_count_next = ifg_count_reg - 8'd4; ifg_count_next = ifg_count_reg - 8'd4;
end else begin end else begin
@ -485,6 +491,10 @@ always @* begin
// wait for end of frame // wait for end of frame
s_axis_tready_next = 1'b1; s_axis_tready_next = 1'b1;
// XGMII idle
xgmii_txd_next = {CTRL_WIDTH{XGMII_IDLE}};
xgmii_txc_next = {CTRL_WIDTH{1'b1}};
if (ifg_count_reg > 8'd4) begin if (ifg_count_reg > 8'd4) begin
ifg_count_next = ifg_count_reg - 8'd4; ifg_count_next = ifg_count_reg - 8'd4;
end else begin end else begin

15
rtl/axis_xgmii_tx_64.v
View File

@ -409,7 +409,7 @@ always @* begin
end end
xgmii_txd_next = s_tdata_reg; xgmii_txd_next = s_tdata_reg;
xgmii_txc_next = 8'b00000000; xgmii_txc_next = {CTRL_WIDTH{1'b0}};
s_tdata_next = s_axis_tdata_masked; s_tdata_next = s_axis_tdata_masked;
s_empty_next = keep2empty(s_axis_tkeep); s_empty_next = keep2empty(s_axis_tkeep);
@ -419,7 +419,7 @@ always @* begin
s_axis_tready_next = 1'b0; s_axis_tready_next = 1'b0;
if (s_axis_tuser[0]) begin if (s_axis_tuser[0]) begin
xgmii_txd_next = {{3{XGMII_IDLE}}, XGMII_TERM, {4{XGMII_ERROR}}}; xgmii_txd_next = {{3{XGMII_IDLE}}, XGMII_TERM, {4{XGMII_ERROR}}};
xgmii_txc_next = 8'b11111111; xgmii_txc_next = {CTRL_WIDTH{1'b1}};
ifg_count_next = 8'd8; ifg_count_next = 8'd8;
state_next = STATE_IFG; state_next = STATE_IFG;
end else begin end else begin
@ -445,7 +445,7 @@ always @* begin
end else begin end else begin
// tvalid deassert, fail frame // tvalid deassert, fail frame
xgmii_txd_next = {{3{XGMII_IDLE}}, XGMII_TERM, {4{XGMII_ERROR}}}; xgmii_txd_next = {{3{XGMII_IDLE}}, XGMII_TERM, {4{XGMII_ERROR}}};
xgmii_txc_next = 8'b11111111; xgmii_txc_next = {CTRL_WIDTH{1'b1}};
ifg_count_next = 8'd8; ifg_count_next = 8'd8;
error_underflow_next = 1'b1; error_underflow_next = 1'b1;
state_next = STATE_WAIT_END; state_next = STATE_WAIT_END;
@ -522,6 +522,11 @@ always @* begin
end end
STATE_IFG: begin STATE_IFG: begin
// send IFG // send IFG
// XGMII idle
xgmii_txd_next = {CTRL_WIDTH{XGMII_IDLE}};
xgmii_txc_next = {CTRL_WIDTH{1'b1}};
if (ifg_count_reg > 8'd8) begin if (ifg_count_reg > 8'd8) begin
ifg_count_next = ifg_count_reg - 8'd8; ifg_count_next = ifg_count_reg - 8'd8;
end else begin end else begin
@ -557,6 +562,10 @@ always @* begin
// wait for end of frame // wait for end of frame
s_axis_tready_next = 1'b1; s_axis_tready_next = 1'b1;
// XGMII idle
xgmii_txd_next = {CTRL_WIDTH{XGMII_IDLE}};
xgmii_txc_next = {CTRL_WIDTH{1'b1}};
if (ifg_count_reg > 8'd8) begin if (ifg_count_reg > 8'd8) begin
ifg_count_next = ifg_count_reg - 8'd8; ifg_count_next = ifg_count_reg - 8'd8;
end else begin end else begin