From d35060b8812e437731b9c81f78febeee6c2075b6 Mon Sep 17 00:00:00 2001 From: Henry Cook Date: Wed, 14 Sep 2016 17:55:16 -0700 Subject: [PATCH] [junctions] messed up the merge lulz --- src/main/scala/junctions/crossing.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/scala/junctions/crossing.scala b/src/main/scala/junctions/crossing.scala index 4e8e4227..c68f5e2a 100644 --- a/src/main/scala/junctions/crossing.scala +++ b/src/main/scala/junctions/crossing.scala @@ -83,6 +83,7 @@ object AsyncIrrevocableFrom // takes from_source from the 'from' clock domain and puts it into your clock domain def apply[T <: Data](from_clock: Clock, from_reset: Bool, from_source: ReadyValidIO[T], depth: Int = 8, sync: Int = 3): IrrevocableIO[T] = { PostQueueIrrevocablize(AsyncDecoupledFrom(from_clock, from_reset, from_source, depth, sync)) + } } /** Because Chisel/FIRRTL does not allow us