From 8aa73915a19464276e4d862bad1bc9a3ed747d15 Mon Sep 17 00:00:00 2001 From: Howard Mao Date: Thu, 7 Jul 2016 18:57:38 -0700 Subject: [PATCH] put locking arbiter back into converter --- uncore/src/main/scala/converters/Nasti.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uncore/src/main/scala/converters/Nasti.scala b/uncore/src/main/scala/converters/Nasti.scala index ffe1c8e2..f41ac764 100644 --- a/uncore/src/main/scala/converters/Nasti.scala +++ b/uncore/src/main/scala/converters/Nasti.scala @@ -212,7 +212,8 @@ class NastiIOTileLinkIOConverter(implicit p: Parameters) extends TLModule()(p) // Aggregate incoming NASTI responses into TL Grants val (tl_cnt_in, tl_wrap_in) = Counter( io.tl.grant.fire() && io.tl.grant.bits.hasMultibeatData(), tlDataBeats) - val gnt_arb = Module(new Arbiter(new GrantToDst, 2)) + val gnt_arb = Module(new LockingArbiter(new GrantToDst, 2, + tlDataBeats, Some((gnt: GrantToDst) => gnt.hasMultibeatData()))) io.tl.grant <> gnt_arb.io.out gnt_arb.io.in(0).valid := io.nasti.r.valid