diplomacy: use new node style chaining

2017-10-27 01:13:19 -07:00
parent 6aac658184
commit a954f020a9
19 changed files with 134 additions and 132 deletions
--- a/src/main/scala/rocket/ScratchpadSlavePort.scala
+++ b/src/main/scala/rocket/ScratchpadSlavePort.scala
@ -122,7 +122,9 @@ trait CanHaveScratchpad extends HasHellaCache with HasICacheFrontend {
      val xbar = LazyModule(new TLXbar)
      xbar.node := slaveNode
      xbarPorts.foreach { case (port, bytes) =>
-        port := TLFragmenter(bytes, cacheBlockBytes, earlyAck=true)(if (bytes == xBytes) xbar.node else TLWidthWidget(xBytes)(xbar.node))
+        (Seq(port, TLFragmenter(bytes, cacheBlockBytes, earlyAck=true))
+          ++ (xBytes != bytes).option(TLWidthWidget(xBytes)))
+          .foldRight(xbar.node:TLOutwardNode)(_ := _)
      }
    }
  }