From 96f09003f2fd216e91563aaa4360f0cb108af27f Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Tue, 5 Jul 2016 16:03:25 -0700
Subject: [PATCH] use options for NastiWriteDataChannel write mask

---
 junctions/src/main/scala/atos.scala  |  2 +-
 junctions/src/main/scala/nasti.scala | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/junctions/src/main/scala/atos.scala b/junctions/src/main/scala/atos.scala
index ee78c853..970a1f5c 100644
--- a/junctions/src/main/scala/atos.scala
+++ b/junctions/src/main/scala/atos.scala
@@ -246,7 +246,7 @@ class AtosRequestDecoder(implicit p: Parameters) extends AtosModule()(p) {
   io.w.bits := NastiWriteDataChannel(
     id = io.req.bits.id(),
     data = io.req.bits.data(),
-    strb = io.req.bits.strb(),
+    strb = Some(io.req.bits.strb()),
     last = io.req.bits.last())
 
   io.req.ready := (io.ar.ready && is_ar) ||
diff --git a/junctions/src/main/scala/nasti.scala b/junctions/src/main/scala/nasti.scala
index f82073bb..564b08f5 100644
--- a/junctions/src/main/scala/nasti.scala
+++ b/junctions/src/main/scala/nasti.scala
@@ -168,21 +168,16 @@ object NastiReadAddressChannel {
 }
 
 object NastiWriteDataChannel {
-  def apply(data: UInt, last: Bool = Bool(true), id: UInt = UInt(0))
+  def apply(data: UInt, strb: Option[UInt] = None,
+            last: Bool = Bool(true), id: UInt = UInt(0))
            (implicit p: Parameters): NastiWriteDataChannel = {
     val w = Wire(new NastiWriteDataChannel)
-    w.strb := Fill(w.nastiWStrobeBits, UInt(1, 1))
+    w.strb := strb.getOrElse(Fill(w.nastiWStrobeBits, UInt(1, 1)))
     w.data := data
     w.last := last
     w.user := UInt(0)
     w
   }
-  def apply(data: UInt, strb: UInt, last: Bool, id: UInt)
-           (implicit p: Parameters): NastiWriteDataChannel = {
-    val w = apply(data, last, id)
-    w.strb := strb
-    w
-  }
 }
 
 object NastiReadDataChannel {