Merge pull request #3372 from chipsalliance/mergify/bp/master/pr-3366

Make AsyncQueue use Rawmodule (backport #3366)
chipsalliance · May 18, 2023 · 55c30bb · 55c30bb
2 parents 78c43fe + 84dca8f
commit 55c30bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/main/scala/util/AsyncQueue.scala b/src/main/scala/util/AsyncQueue.scala
@@ -221,13 +221,8 @@ object ToAsyncBundle
 
 class AsyncQueue[T <: Data](gen: T, params: AsyncQueueParams = AsyncQueueParams()) extends Crossing[T] {
   val io = IO(new CrossingIO(gen))
-  val source = Module(new AsyncQueueSource(gen, params))
-  val sink   = Module(new AsyncQueueSink  (gen, params))
-
-  source.clock := io.enq_clock
-  source.reset := io.enq_reset
-  sink.clock := io.deq_clock
-  sink.reset := io.deq_reset
+  val source = withClockAndReset(io.enq_clock, io.enq_reset) { Module(new AsyncQueueSource(gen, params)) }
+  val sink   = withClockAndReset(io.deq_clock, io.deq_reset) { Module(new AsyncQueueSink  (gen, params)) }
 
   source.io.enq <> io.enq
   io.deq <> sink.io.deq

diff --git a/src/main/scala/util/Crossing.scala b/src/main/scala/util/Crossing.scala
@@ -16,6 +16,6 @@ class CrossingIO[T <: Data](gen: T) extends Bundle {
   val deq = Decoupled(gen)
 }
 
-abstract class Crossing[T <: Data] extends Module {
+abstract class Crossing[T <: Data] extends RawModule {
   val io: CrossingIO[T]
 }