riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

[junctions] messed up the merge lulz

Browse Source
This commit is contained in:
Henry Cook 2016-09-14 17:55:16 -07:00 committed by GitHub
parent 1b53e477fa
commit d35060b881
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/junctions/crossing.scala
View File

@ -83,6 +83,7 @@ object AsyncIrrevocableFrom
// takes from_source from the 'from' clock domain and puts it into your clock domain // 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] = { 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)) PostQueueIrrevocablize(AsyncDecoupledFrom(from_clock, from_reset, from_source, depth, sync))
}
} }
/** Because Chisel/FIRRTL does not allow us /** Because Chisel/FIRRTL does not allow us