summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Lawson2016-10-07 13:25:44 -0700
committerJim Lawson2016-10-07 13:25:44 -0700
commit87606210dd0a15122ea93136a3e9b073674d779e (patch)
treeb5e31a20086ff80a53cb956611b455619c803b2f
parentf12016fd5412467313cceff3f1af39643c8bc7a2 (diff)
Revert "Revert "Merge pull request #322 from ucb-bar/deleteEnqIODeqIO""
This reverts commit 10f170110cd00e7e5e0b428c0490594dac4db225.
-rw-r--r--src/main/scala/chisel3/compatibility.scala19
-rw-r--r--src/main/scala/chisel3/package.scala22
2 files changed, 0 insertions, 41 deletions
diff --git a/src/main/scala/chisel3/compatibility.scala b/src/main/scala/chisel3/compatibility.scala
index d13fcb06..d0d2ddb4 100644
--- a/src/main/scala/chisel3/compatibility.scala
+++ b/src/main/scala/chisel3/compatibility.scala
@@ -158,25 +158,6 @@ package object Chisel { // scalastyle:ignore package.object.name
type DecoupledIO[+T <: Data] = chisel3.util.DecoupledIO[T]
val DecoupledIO = chisel3.util.Decoupled
val Decoupled = chisel3.util.Decoupled
- class EnqIO[+T <: Data](gen: T) extends DecoupledIO(gen) {
- def init(): Unit = {
- this.noenq()
- }
- override def cloneType: this.type = EnqIO(gen).asInstanceOf[this.type]
- }
- class DeqIO[+T <: Data](gen: T) extends DecoupledIO(gen) {
- chisel3.core.Binding.bind(this, chisel3.core.FlippedBinder, "Error: Cannot flip ")
- def init(): Unit = {
- this.nodeq()
- }
- override def cloneType: this.type = DeqIO(gen).asInstanceOf[this.type]
- }
- object EnqIO {
- def apply[T<:Data](gen: T): DecoupledIO[T] = DecoupledIO(gen)
- }
- object DeqIO {
- def apply[T<:Data](gen: T): DecoupledIO[T] = Flipped(DecoupledIO(gen))
- }
type QueueIO[T <: Data] = chisel3.util.QueueIO[T]
type Queue[T <: Data] = chisel3.util.Queue[T]
val Queue = chisel3.util.Queue
diff --git a/src/main/scala/chisel3/package.scala b/src/main/scala/chisel3/package.scala
index 17ddd55a..0a57b7de 100644
--- a/src/main/scala/chisel3/package.scala
+++ b/src/main/scala/chisel3/package.scala
@@ -166,28 +166,6 @@ package object chisel3 { // scalastyle:ignore package.object.name
val NODIR = chisel3.core.Direction.Unspecified
type ChiselException = chisel3.internal.ChiselException
- class EnqIO[+T <: Data](gen: T) extends DecoupledIO(gen) {
- def init(): Unit = {
- this.noenq()
- }
- override def cloneType: this.type = EnqIO(gen).asInstanceOf[this.type]
- }
- class DeqIO[+T <: Data](gen: T) extends DecoupledIO(gen) {
- val Data = chisel3.core.Data
- Data.setFirrtlDirection(this, Data.getFirrtlDirection(this).flip)
- Binding.bind(this, FlippedBinder, "Error: Cannot flip ")
- def init(): Unit = {
- this.nodeq()
- }
- override def cloneType: this.type = DeqIO(gen).asInstanceOf[this.type]
- }
- object EnqIO {
- def apply[T<:Data](gen: T): EnqIO[T] = new EnqIO(gen)
- }
- object DeqIO {
- def apply[T<:Data](gen: T): DeqIO[T] = new DeqIO(gen)
- }
-
// Debugger/Tester access to internal Chisel data structures and methods.
def getDataElements(a: Aggregate): Seq[Element] = {
a.allElements