From 2218ece98a5344a024a3b7d42fcd040e3775903a Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Mon, 1 Feb 2016 00:08:27 +0100
Subject: [PATCH] soc/interconnect/stream: fix merge issue (missing params
 connect)

---
 litex/soc/interconnect/stream.py | 38 ++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/litex/soc/interconnect/stream.py b/litex/soc/interconnect/stream.py
index 59434a35..116c9b1e 100644
--- a/litex/soc/interconnect/stream.py
+++ b/litex/soc/interconnect/stream.py
@@ -59,10 +59,10 @@ class Endpoint(Record):
 
 
 class Source(Endpoint):
-	pass
+    pass
 
 class Sink(Endpoint):
-	pass
+    pass
 
 
 class _FIFOWrapper(Module):
@@ -256,8 +256,8 @@ class Buffer(PipelinedActor):
         PipelinedActor.__init__(self, 1)
         self.sync += \
             If(self.pipe_ce,
-            	self.source.payload.eq(self.sink.payload),
-            	self.source.param.eq(self.sink.param)
+                self.source.payload.eq(self.sink.payload),
+                self.source.param.eq(self.sink.param)
             )
 
 
@@ -315,6 +315,11 @@ class Unpack(Module):
             cases[i] = [source.payload.raw_bits().eq(getattr(sink.payload, "chunk"+str(chunk)).raw_bits())]
         self.comb += Case(mux, cases).makedefault()
 
+        for f in description_from.param_layout:
+            src = getattr(self.sink, f[0])
+            dst = getattr(self.source, f[0])
+            self.comb += dst.eq(src)
+
         if description_from.packetized:
             self.comb += [
                 source.sop.eq(sink.sop & first),
@@ -347,6 +352,11 @@ class Pack(Module):
             load_part.eq(sink.stb & sink.ack)
         ]
 
+        for f in description_to.param_layout:
+            src = getattr(self.sink, f[0])
+            dst = getattr(self.source, f[0])
+            self.sync += If(load_part, dst.eq(src))
+
         if description_to.packetized:
             demux_last = ((demux == (n - 1)) | sink.eop)
         else:
@@ -397,6 +407,11 @@ class Chunkerize(CombinatorialActor):
                 dst = getattr(getattr(self.source, "chunk"+str(chunk)), f[0])
                 self.comb += dst.eq(src[i*len(src)//n:(i+1)*len(src)//n])
 
+        for f in self.sink.description.param_layout:
+            src = getattr(self.sink, f[0])
+            dst = getattr(self.source, f[0])
+            self.comb += dst.eq(src)
+
 
 class Unchunkerize(CombinatorialActor):
     def __init__(self, layout_from, n, layout_to, reverse=False):
@@ -420,6 +435,11 @@ class Unchunkerize(CombinatorialActor):
                 dst = getattr(self.source, f[0])
                 self.comb += dst[i*len(dst)//n:(i+1)*len(dst)//n].eq(src)
 
+        for f in self.sink.description.param_layout:
+            src = getattr(self.sink, f[0])
+            dst = getattr(self.source, f[0])
+            self.comb += dst.eq(src)
+
 
 class Converter(Module):
     def __init__(self, layout_from, layout_to, reverse=False):
@@ -440,9 +460,9 @@ class Converter(Module):
             self.submodules.unpack = Unpack(ratio, layout_to)
 
             self.submodules += Pipeline(self.sink,
-            	                        self.chunkerize,
-            	                        self.unpack,
-            	                        self.source)
+                                        self.chunkerize,
+                                        self.unpack,
+                                        self.source)
         # upconverter
         elif width_to > width_from:
             if width_to % width_from:
@@ -452,8 +472,8 @@ class Converter(Module):
             self.submodules.unchunkerize = Unchunkerize(layout_from, ratio, layout_to, reverse)
 
             self.submodules += Pipeline(self.sink,
-            	                        self.pack,
-            	                        self.unchunkerize,
+                                        self.pack,
+                                        self.unchunkerize,
                                         self.source)
         # direct connection
         else:
-- 
2.30.2