Revert "eth+ipv4prot: Fix protocol arbitration"
This reverts commit 9258edd0d97ebcf924d81e2db2b9bdae0b9e575a. We cannot just look at tx_en as there will be one more ack strobe after its deassertion, which needs to get through to the real source. Reopens #13.
This commit is contained in:
parent
9258edd0d9
commit
f5b691fae5
@ -141,10 +141,7 @@ begin
|
|||||||
end if;
|
end if;
|
||||||
|
|
||||||
when TXD =>
|
when TXD =>
|
||||||
if (not mac_in.tx_mac_data_en or not mac_out.tx_active) then
|
state <= IDLE when (not mac_in.tx_mac_data_en or not mac_out.tx_active);
|
||||||
state <= IDLE;
|
|
||||||
sel <= SEL_ETH_I; -- To avoid arbitration errors, always select the highest priority one by default
|
|
||||||
end if;
|
|
||||||
end case;
|
end case;
|
||||||
end if;
|
end if;
|
||||||
end process arb;
|
end process arb;
|
||||||
|
@ -105,10 +105,7 @@ begin
|
|||||||
end loop;
|
end loop;
|
||||||
|
|
||||||
when TXD =>
|
when TXD =>
|
||||||
if not ipv4_in.tx_en then
|
state <= IDLE when (not ipv4_in.tx_en);
|
||||||
state <= IDLE;
|
|
||||||
tx_sel <= ipv4_protocol_in'left; -- To avoid arbitration errors, always select the highest priority one by default
|
|
||||||
end if;
|
|
||||||
end case;
|
end case;
|
||||||
end if;
|
end if;
|
||||||
end process arb;
|
end process arb;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user