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

TLToAPB: use the now standard aFlow parameter name

Browse Source
This commit is contained in:
Wesley W. Terpstra 2017-03-16 15:34:28 -07:00
parent e31b84af33
commit 882a7ff8ff
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/uncore/tilelink2/ToAPB.scala
View File

@ -31,7 +31,9 @@ case class TLToAPBNode() extends MixedAdapterNode(TLImp, APBImp)(
TLManagerPortParameters(managers, beatBytes, 1, 0) TLManagerPortParameters(managers, beatBytes, 1, 0)
}) })
class TLToAPB(combinational: Boolean = true)(implicit p: Parameters) extends LazyModule // The input side has either a flow queue (aFlow=true) or a pipe queue (aFlow=false)
// The output side always has a flow queue
class TLToAPB(val aFlow: Boolean = true)(implicit p: Parameters) extends LazyModule
{ {
val node = TLToAPBNode() val node = TLToAPBNode()
@ -60,7 +62,7 @@ class TLToAPB(combinational: Boolean = true)(implicit p: Parameters) extends Laz
in.d <> Queue(d, 1, flow = true) in.d <> Queue(d, 1, flow = true)
// We need an irrevocable input for APB to stall // We need an irrevocable input for APB to stall
val a = Queue(in.a, 1, flow = combinational, pipe = !combinational) val a = Queue(in.a, 1, flow = aFlow, pipe = !aFlow)
val a_enable = RegInit(Bool(false)) val a_enable = RegInit(Bool(false))
val a_sel = a.valid && RegNext(!in.d.valid || in.d.ready) val a_sel = a.valid && RegNext(!in.d.valid || in.d.ready)
@ -90,8 +92,8 @@ class TLToAPB(combinational: Boolean = true)(implicit p: Parameters) extends Laz
object TLToAPB object TLToAPB
{ {
// applied to the TL source node; y.node := TLToAPB()(x.node) // applied to the TL source node; y.node := TLToAPB()(x.node)
def apply(combinational: Boolean = true)(x: TLOutwardNode)(implicit p: Parameters, sourceInfo: SourceInfo): APBOutwardNode = { def apply(aFlow: Boolean = true)(x: TLOutwardNode)(implicit p: Parameters, sourceInfo: SourceInfo): APBOutwardNode = {
val apb = LazyModule(new TLToAPB(combinational)) val apb = LazyModule(new TLToAPB(aFlow))
apb.node := x apb.node := x
apb.node apb.node
} }