change to use doCloneType for users, add collectElts, get rid of delayedInit

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/scala/utils.scala b/src/main/scala/utils.scala
index 4135d92b..3bbea34a 100644
--- a/src/main/scala/utils.scala
+++ b/src/main/scala/utils.scala
@@ -280,7 +280,7 @@ class ValidIO[+T <: Data](gen2: T) extends Bundle
   val valid = Bool(OUTPUT)
   val bits = gen2.cloneType.asOutput
   def fire(dummy: Int = 0): Bool = valid
-  override def cloneType: this.type = new ValidIO(gen2).asInstanceOf[this.type]
+  override def doCloneType: this.type = new ValidIO(gen2).asInstanceOf[this.type]
 }
 
 /** Adds a valid protocol to any interface. The standard used is
@@ -296,7 +296,7 @@ class DecoupledIO[+T <: Data](gen: T) extends Bundle
   val valid = Bool(OUTPUT)
   val bits  = gen.cloneType.asOutput
   def fire(dummy: Int = 0): Bool = ready && valid
-  override def cloneType: this.type = new DecoupledIO(gen).asInstanceOf[this.type]
+  override def doCloneType: this.type = new DecoupledIO(gen).asInstanceOf[this.type]
 }
 
 /** Adds a ready-valid handshaking protocol to any interface.
@@ -315,7 +315,7 @@ class EnqIO[T <: Data](gen: T) extends DecoupledIO(gen)
     for (io <- bits.flatten)
       io := UInt(0)
   }
-  override def cloneType: this.type = { new EnqIO(gen).asInstanceOf[this.type]; }
+  override def doCloneType: this.type = { new EnqIO(gen).asInstanceOf[this.type]; }
 }
 
 class DeqIO[T <: Data](gen: T) extends DecoupledIO(gen)
@@ -325,7 +325,7 @@ class DeqIO[T <: Data](gen: T) extends DecoupledIO(gen)
     ready := Bool(false)
   }
   def deq(b: Boolean = false): T = { ready := Bool(true); bits }
-  override def cloneType: this.type = { new DeqIO(gen).asInstanceOf[this.type]; }
+  override def doCloneType: this.type = { new DeqIO(gen).asInstanceOf[this.type]; }
 }