summaryrefslogtreecommitdiff
path: root/src/main/scala/Chisel/util
diff options
context:
space:
mode:
authorAndrew Waterman2016-01-23 16:10:22 -0800
committerAndrew Waterman2016-01-23 16:10:22 -0800
commitb4517e0fb563271464bd40ddf9a46a40fd827da4 (patch)
treef8a7c4a9e982590fb140d6945d2e875d0b2e45c1 /src/main/scala/Chisel/util
parent780e7c4d2a7e88a3a8ce6f5d7e75e62af6580c6d (diff)
Don't use deprecated constructs
Diffstat (limited to 'src/main/scala/Chisel/util')
-rw-r--r--src/main/scala/Chisel/util/Arbiter.scala2
-rw-r--r--src/main/scala/Chisel/util/Decoupled.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/Chisel/util/Arbiter.scala b/src/main/scala/Chisel/util/Arbiter.scala
index 119b9f5a..2747640f 100644
--- a/src/main/scala/Chisel/util/Arbiter.scala
+++ b/src/main/scala/Chisel/util/Arbiter.scala
@@ -7,7 +7,7 @@ package Chisel
/** An I/O bundle for the Arbiter */
class ArbiterIO[T <: Data](gen: T, n: Int) extends Bundle {
- val in = Vec(Decoupled(gen), n).flip
+ val in = Vec(n, Decoupled(gen)).flip
val out = Decoupled(gen)
val chosen = UInt(OUTPUT, log2Up(n))
}
diff --git a/src/main/scala/Chisel/util/Decoupled.scala b/src/main/scala/Chisel/util/Decoupled.scala
index b1505887..ca000af9 100644
--- a/src/main/scala/Chisel/util/Decoupled.scala
+++ b/src/main/scala/Chisel/util/Decoupled.scala
@@ -82,7 +82,7 @@ class Queue[T <: Data](gen: T, val entries: Int,
{
val io = new QueueIO(gen, entries)
- val ram = Mem(gen, entries)
+ val ram = Mem(entries, gen)
val enq_ptr = Counter(entries)
val deq_ptr = Counter(entries)
val maybe_full = Reg(init=Bool(false))