From 60d9291cb5d18e0ab8c424322823152ad31173d0 Mon Sep 17 00:00:00 2001 From: Howard Mao Date: Thu, 28 Jan 2016 14:50:24 -0800 Subject: [PATCH] rename external to nastiExternal to avoid name conflicts --- junctions/src/main/scala/nasti.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/junctions/src/main/scala/nasti.scala b/junctions/src/main/scala/nasti.scala index 579ef6f4..57c12a69 100644 --- a/junctions/src/main/scala/nasti.scala +++ b/junctions/src/main/scala/nasti.scala @@ -12,12 +12,12 @@ case class NastiParameters(dataBits: Int, addrBits: Int, idBits: Int) trait HasNastiParameters { implicit val p: Parameters - val external = p(NastiKey) - val nastiXDataBits = external.dataBits + val nastiExternal = p(NastiKey) + val nastiXDataBits = nastiExternal.dataBits val nastiWStrobeBits = nastiXDataBits / 8 - val nastiXAddrBits = external.addrBits - val nastiWIdBits = external.idBits - val nastiRIdBits = external.idBits + val nastiXAddrBits = nastiExternal.addrBits + val nastiWIdBits = nastiExternal.idBits + val nastiRIdBits = nastiExternal.idBits val nastiXIdBits = max(nastiWIdBits, nastiRIdBits) val nastiXUserBits = 1 val nastiAWUserBits = nastiXUserBits