From 9c3cd8f9fea601a3a916fafc1fc970633bf2c882 Mon Sep 17 00:00:00 2001 From: Henry Cook Date: Wed, 21 Oct 2015 18:15:46 -0700 Subject: [PATCH] depend on external cde library --- junctions/src/main/scala/addrmap.scala | 1 + junctions/src/main/scala/hasti.scala | 1 + junctions/src/main/scala/memserdes.scala | 1 + junctions/src/main/scala/nasti.scala | 1 + junctions/src/main/scala/poci.scala | 1 + junctions/src/main/scala/smi.scala | 1 + junctions/src/main/scala/util.scala | 1 + 7 files changed, 7 insertions(+) diff --git a/junctions/src/main/scala/addrmap.scala b/junctions/src/main/scala/addrmap.scala index 8e6dea4e..d5e7292e 100644 --- a/junctions/src/main/scala/addrmap.scala +++ b/junctions/src/main/scala/addrmap.scala @@ -3,6 +3,7 @@ package junctions import Chisel._ +import cde.{Parameters, Field} import scala.collection.mutable.HashMap case object PAddrBits extends Field[Int] diff --git a/junctions/src/main/scala/hasti.scala b/junctions/src/main/scala/hasti.scala index 7a913dfe..f68ff2f1 100644 --- a/junctions/src/main/scala/hasti.scala +++ b/junctions/src/main/scala/hasti.scala @@ -1,6 +1,7 @@ package junctions import Chisel._ +import cde.{Parameters, Field} trait HastiConstants { diff --git a/junctions/src/main/scala/memserdes.scala b/junctions/src/main/scala/memserdes.scala index 2fc8ace1..c8bfd7b6 100644 --- a/junctions/src/main/scala/memserdes.scala +++ b/junctions/src/main/scala/memserdes.scala @@ -3,6 +3,7 @@ package junctions import Chisel._ import scala.math._ +import cde.{Parameters, Field} case object MIFAddrBits extends Field[Int] case object MIFDataBits extends Field[Int] diff --git a/junctions/src/main/scala/nasti.scala b/junctions/src/main/scala/nasti.scala index 7d401655..0f4d8b7c 100644 --- a/junctions/src/main/scala/nasti.scala +++ b/junctions/src/main/scala/nasti.scala @@ -4,6 +4,7 @@ package junctions import Chisel._ import scala.math.max import scala.collection.mutable.ArraySeq +import cde.{Parameters, Field} case object NastiKey extends Field[NastiParameters] diff --git a/junctions/src/main/scala/poci.scala b/junctions/src/main/scala/poci.scala index bac75966..0ba4bb58 100644 --- a/junctions/src/main/scala/poci.scala +++ b/junctions/src/main/scala/poci.scala @@ -1,6 +1,7 @@ package junctions import Chisel._ +import cde.{Parameters, Field} abstract trait PociConstants { diff --git a/junctions/src/main/scala/smi.scala b/junctions/src/main/scala/smi.scala index 7d26deb7..96616b1e 100644 --- a/junctions/src/main/scala/smi.scala +++ b/junctions/src/main/scala/smi.scala @@ -1,6 +1,7 @@ package junctions import Chisel._ +import cde.Parameters class SMIReq(val dataWidth: Int, val addrWidth: Int) extends Bundle { val rw = Bool() diff --git a/junctions/src/main/scala/util.scala b/junctions/src/main/scala/util.scala index 9f59ba4f..16950cd1 100644 --- a/junctions/src/main/scala/util.scala +++ b/junctions/src/main/scala/util.scala @@ -1,6 +1,7 @@ /// See LICENSE for license details. package junctions import Chisel._ +import cde.Parameters object bigIntPow2 { def apply(in: BigInt): Boolean = in > 0 && ((in & (in-1)) == 0)