Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/migen
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 09b33346beb3
Choose a base ref
...
head repository: m-labs/migen
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 493f424ebd63
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 22, 2015

  1. actorlib/packet/Depacketizer: manage layouts without error signal

    @enjoy-digital
    enjoy-digital committed Jul 22, 2015
    Copy the full SHA
    5713ae3 View commit details

  2. Merge branch 'master' of https://github.com/m-labs/migen

    @enjoy-digital
    enjoy-digital committed Jul 22, 2015
    Copy the full SHA
    493f424 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 migen/actorlib/packet.py
4 changes: 3 additions & 1 deletion migen/actorlib/packet.py
View file
Original file line number Diff line number Diff line change
@@ -282,10 +282,12 @@ def __init__(self, sink_description, source_description, header):
).Elif(source.stb & source.ack,
source.sop.eq(0)
)

if hasattr(sink, "error"):
self.comb += source_error.eq(sink.error)
self.comb += [
source.eop.eq(sink.eop | no_payload),
source.data.eq(sink.data),
source.error.eq(sink.error),
header.decode(self.header, source)
]
fsm.act("COPY",