summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/scala/chisel3/compatibility.scala4
-rw-r--r--src/main/scala/chisel3/package.scala2
-rw-r--r--src/main/scala/chisel3/util/Arbiter.scala4
-rw-r--r--src/main/scala/chisel3/util/Decoupled.scala6
4 files changed, 8 insertions, 8 deletions
diff --git a/src/main/scala/chisel3/compatibility.scala b/src/main/scala/chisel3/compatibility.scala
index 49b8bb2c..3b1b5b0a 100644
--- a/src/main/scala/chisel3/compatibility.scala
+++ b/src/main/scala/chisel3/compatibility.scala
@@ -146,8 +146,8 @@ package object Chisel { // scalastyle:ignore package.object.name
val Counter = chisel3.util.Counter
type DecoupledIO[+T <: Data] = chisel3.util.DecoupledIO[T]
- val DecoupledIO = chisel3.util.DecoupledIO
- val Decoupled = chisel3.util.DecoupledIO
+ val DecoupledIO = chisel3.util.Decoupled
+ val Decoupled = chisel3.util.Decoupled
class EnqIO[+T <: Data](gen: T) extends DecoupledIO(gen) {
def init(): Unit = {
this.noenq()
diff --git a/src/main/scala/chisel3/package.scala b/src/main/scala/chisel3/package.scala
index 8f01779f..24deb64f 100644
--- a/src/main/scala/chisel3/package.scala
+++ b/src/main/scala/chisel3/package.scala
@@ -167,7 +167,7 @@ package object chisel3 { // scalastyle:ignore package.object.name
type ChiselException = chisel3.internal.ChiselException
type ValidIO[+T <: Data] = chisel3.util.Valid[T]
val ValidIO = chisel3.util.Valid
- val Decoupled = chisel3.util.DecoupledIO
+ val DecoupledIO = chisel3.util.Decoupled
class EnqIO[+T <: Data](gen: T) extends DecoupledIO(gen) {
def init(): Unit = {
diff --git a/src/main/scala/chisel3/util/Arbiter.scala b/src/main/scala/chisel3/util/Arbiter.scala
index 5d46b7b9..c80f1908 100644
--- a/src/main/scala/chisel3/util/Arbiter.scala
+++ b/src/main/scala/chisel3/util/Arbiter.scala
@@ -10,8 +10,8 @@ import chisel3.NotStrict.CompileOptions
/** An I/O bundle for the Arbiter */
class ArbiterIO[T <: Data](gen: T, n: Int) extends Bundle {
- val in = Flipped(Vec(n, DecoupledIO(gen)))
- val out = DecoupledIO(gen)
+ val in = Flipped(Vec(n, Decoupled(gen)))
+ val out = Decoupled(gen)
val chosen = Output(UInt.width(log2Up(n)))
}
diff --git a/src/main/scala/chisel3/util/Decoupled.scala b/src/main/scala/chisel3/util/Decoupled.scala
index 14637c9b..7c377bfb 100644
--- a/src/main/scala/chisel3/util/Decoupled.scala
+++ b/src/main/scala/chisel3/util/Decoupled.scala
@@ -62,7 +62,7 @@ object ReadyValidIO {
}
}
-object DecoupledIO {
+object Decoupled {
/** Adds a ready-valid handshaking protocol to any interface.
* The standard used is that the consumer uses the flipped interface.
*/
@@ -113,10 +113,10 @@ object Irrevocable
}
object EnqIO {
- def apply[T<:Data](gen: T): DecoupledIO[T] = DecoupledIO(gen)
+ def apply[T<:Data](gen: T): DecoupledIO[T] = Decoupled(gen)
}
object DeqIO {
- def apply[T<:Data](gen: T): DecoupledIO[T] = Flipped(DecoupledIO(gen))
+ def apply[T<:Data](gen: T): DecoupledIO[T] = Flipped(Decoupled(gen))
}
/** An I/O Bundle for Queues