From 80965e82307607ba2f9f06caf131ccd4a1f9e5a6 Mon Sep 17 00:00:00 2001
From: "Wesley W. Terpstra" <wesley@sifive.com>
Date: Wed, 6 Sep 2017 15:44:54 -0700
Subject: [PATCH] =?UTF-8?q?tilelink=20Buffer:=20use=20new=20:=3D=3F=20adap?=
 =?UTF-8?q?ter=20API?=

---
 src/main/scala/tilelink/Buffer.scala | 18 ++++++++++++++----
 src/main/scala/tilelink/Bus.scala    |  8 +++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/tilelink/Buffer.scala b/src/main/scala/tilelink/Buffer.scala
index 3a8869de..4ce803cc 100644
--- a/src/main/scala/tilelink/Buffer.scala
+++ b/src/main/scala/tilelink/Buffer.scala
@@ -73,7 +73,7 @@ object TLBuffer
       d: BufferParams,
       e: BufferParams)(x: TLOutwardNode)(implicit p: Parameters, sourceInfo: SourceInfo): TLOutwardNode = {
     val buffer = LazyModule(new TLBuffer(a, b, c, d, e))
-    buffer.node := x
+    buffer.node :=? x
     buffer.node
   }
 }
@@ -82,18 +82,19 @@ class TLBufferChain(depth: Int)(implicit p: Parameters) extends LazyModule {
 
   val nodeIn = TLInputNode()
   val nodeOut = TLOutputNode()
+  val node = NodeHandle(nodeIn, nodeOut)
 
   val buf_chain = if (depth > 0) {
     val chain = List.fill(depth)(LazyModule(new TLBuffer(BufferParams.default)))
 
-    (chain.init zip chain.tail) foreach { case(prev, next) => next.node :=* prev.node }
+    (chain.init zip chain.tail) foreach { case(prev, next) => next.node :=? prev.node }
     chain
   } else {
     List(LazyModule(new TLBuffer(BufferParams.none)))
   }
 
-  buf_chain.head.node :=* nodeIn
-  nodeOut :=* buf_chain.last.node
+  buf_chain.head.node :=? nodeIn
+  nodeOut :=? buf_chain.last.node
 
   lazy val module = new LazyModuleImp(this) {
     val io = new Bundle {
@@ -102,3 +103,12 @@ class TLBufferChain(depth: Int)(implicit p: Parameters) extends LazyModule {
     }
   }
 }
+
+object TLBufferChain
+{
+  def apply(depth: Int)(x: TLOutwardNode)(implicit p: Parameters, sourceInfo: SourceInfo): TLOutwardNode = {
+    val buffer = LazyModule(new TLBufferChain(depth))
+    buffer.node :=? x
+    buffer.node
+  }
+}
diff --git a/src/main/scala/tilelink/Bus.scala b/src/main/scala/tilelink/Bus.scala
index d9a7f364..d6774c56 100644
--- a/src/main/scala/tilelink/Bus.scala
+++ b/src/main/scala/tilelink/Bus.scala
@@ -68,9 +68,11 @@ abstract class TLBusWrapper(params: TLBusParams, val busName: String)(implicit p
   protected def inwardBufNode: TLInwardNode = master_buffer.node
 
   protected def bufferChain(depth: Int, name: Option[String] = None): (TLInwardNode, TLOutwardNode) = {
-    val chain = LazyModule(new TLBufferChain(depth))
-    name.foreach { n => chain.suggestName(s"${busName}_${n}_TLBufferChain")}
-    (chain.nodeIn, chain.nodeOut)
+    RightStar { implicit p =>
+      val chain = LazyModule(new TLBufferChain(depth))
+      name.foreach { n => chain.suggestName(s"${busName}_${n}_TLBufferChain")}
+      (chain.nodeIn, chain.nodeOut)
+    }
   }
 
   def bufferFromMasters: TLInwardNode = inwardBufNode