Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

liteeth/mac/core: simplify and fix padding

This commit is contained in:
Florent Kermarrec 2015-04-24 09:06:26 +02:00
parent ff2d1d9383
commit 2d56d32009
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
misoclib/com/liteeth/mac/core/padding.py
View File

@ -3,24 +3,29 @@ from misoclib.com.liteeth.generic import *
class LiteEthMACPaddingInserter(Module): class LiteEthMACPaddingInserter(Module):
def __init__(self, dw, packet_min_length): def __init__(self, dw, padding):
self.sink = sink = Sink(eth_phy_description(dw)) self.sink = sink = Sink(eth_phy_description(dw))
self.source = source = Source(eth_phy_description(dw)) self.source = source = Source(eth_phy_description(dw))
# # # # # #
packet_min_data = math.ceil(packet_min_length/(dw/8)) padding_limit = math.ceil(padding/(dw/8))-1
self.submodules.counter = counter = Counter(max=eth_mtu) self.submodules.counter = counter = Counter(16, reset=1)
counter_done = Signal()
self.comb += [
counter.reset.eq(sink.stb & sink.sop & sink.ack),
counter.ce.eq(source.stb & source.ack),
counter_done.eq(counter.value >= padding_limit),
]
self.submodules.fsm = fsm = FSM(reset_state="COPY") self.submodules.fsm = fsm = FSM(reset_state="IDLE")
fsm.act("COPY", fsm.act("IDLE",
counter.reset.eq(sink.stb & sink.sop),
Record.connect(sink, source), Record.connect(sink, source),
If(sink.stb & sink.ack, If(source.stb & source.ack,
counter.ce.eq(1), counter.ce.eq(1),
If(sink.eop, If(sink.eop,
If(counter.value < packet_min_data, If(~counter_done,
source.eop.eq(0), source.eop.eq(0),
NextState("PADDING") NextState("PADDING")
) )
@ -29,12 +34,11 @@ class LiteEthMACPaddingInserter(Module):
) )
fsm.act("PADDING", fsm.act("PADDING",
source.stb.eq(1), source.stb.eq(1),
source.eop.eq(counter.value == packet_min_data), source.eop.eq(counter_done),
source.data.eq(0), source.data.eq(0),
If(source.ack, If(source.ack,
counter.ce.eq(1), If(counter_done,
If(source.eop, NextState("IDLE")
NextState("COPY")
) )
) )
) )