projects
/
sifive-blocks.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e4960a4
)
devices: switch to using node-style API (#44)
author
Wesley W. Terpstra
<wesley@sifive.com>
Sat, 28 Oct 2017 19:29:31 +0000
(12:29 -0700)
committer
GitHub
<noreply@github.com>
Sat, 28 Oct 2017 19:29:31 +0000
(12:29 -0700)
src/main/scala/devices/mockaon/MockAONPeriphery.scala
patch
|
blob
|
history
src/main/scala/devices/mockaon/MockAONWrapper.scala
patch
|
blob
|
history
src/main/scala/devices/spi/SPIPeriphery.scala
patch
|
blob
|
history
diff --git
a/src/main/scala/devices/mockaon/MockAONPeriphery.scala
b/src/main/scala/devices/mockaon/MockAONPeriphery.scala
index 6bdf6d5d7a65a3b93ea1bb679016fbe04f3d1554..f7f563bc77e9d8fea1f5188fff3782c22abf10a5 100644
(file)
--- a/
src/main/scala/devices/mockaon/MockAONPeriphery.scala
+++ b/
src/main/scala/devices/mockaon/MockAONPeriphery.scala
@@
-22,8
+22,8
@@
trait HasPeripheryMockAON extends HasPeripheryBus
// are in the proper clock domain.
val mockAONParams= p(PeripheryMockAONKey)
val aon = LazyModule(new MockAONWrapper(pbus.beatBytes, mockAONParams))
// are in the proper clock domain.
val mockAONParams= p(PeripheryMockAONKey)
val aon = LazyModule(new MockAONWrapper(pbus.beatBytes, mockAONParams))
- aon.node :=
pbus.toAsyncVariableWidthSlaves(sync = 3)
- ibus.from
Async
:= aon.intnode
+ aon.node :=
TLAsyncCrossingSource() := pbus.toVariableWidthSlaves
+ ibus.from
Sync := IntSyncCrossingSink()
:= aon.intnode
}
trait HasPeripheryMockAONBundle {
}
trait HasPeripheryMockAONBundle {
diff --git
a/src/main/scala/devices/mockaon/MockAONWrapper.scala
b/src/main/scala/devices/mockaon/MockAONWrapper.scala
index 426c200b27dbd8766d7bd551dff6167f6e0ff303..86e5f1949317a8899f81849df95941420f689923 100644
(file)
--- a/
src/main/scala/devices/mockaon/MockAONWrapper.scala
+++ b/
src/main/scala/devices/mockaon/MockAONWrapper.scala
@@
-44,12
+44,10
@@
class MockAONWrapper(w: Int, c: MockAONParams)(implicit p: Parameters) extends L
val isolation = LazyModule(new TLIsolation(fOut = isoOut, fIn = isoIn))
val crossing = LazyModule(new TLAsyncCrossingSink(depth = 1))
val isolation = LazyModule(new TLIsolation(fOut = isoOut, fIn = isoIn))
val crossing = LazyModule(new TLAsyncCrossingSink(depth = 1))
- val node: TLAsyncInwardNode = isolation.node
- crossing.node := isolation.node
- aon.node := crossing.node
+ val node = aon.node := crossing.node := isolation.node
// crossing lives outside in Periphery
// crossing lives outside in Periphery
- val intnode
: IntOutwardNode
= aon.intnode
+ val intnode
= IntSyncCrossingSource(alreadyRegistered = true) :
= aon.intnode
lazy val module = new LazyModuleImp(this) {
val io = IO(new MockAONWrapperBundle {
lazy val module = new LazyModuleImp(this) {
val io = IO(new MockAONWrapperBundle {
diff --git
a/src/main/scala/devices/spi/SPIPeriphery.scala
b/src/main/scala/devices/spi/SPIPeriphery.scala
index b2edb0f64f14d2f9009af8d34cfbc56d6992a953..dd76d15db4df1ca8149bef39a53c55f0b8cb2478 100644
(file)
--- a/
src/main/scala/devices/spi/SPIPeriphery.scala
+++ b/
src/main/scala/devices/spi/SPIPeriphery.scala
@@
-41,10
+41,10
@@
trait HasPeripherySPIFlash extends HasPeripheryBus with HasInterruptBus {
val qspis = spiFlashParams map { params =>
val qspi = LazyModule(new TLSPIFlash(pbus.beatBytes, params))
qspi.rnode := pbus.toVariableWidthSlaves
val qspis = spiFlashParams map { params =>
val qspi = LazyModule(new TLSPIFlash(pbus.beatBytes, params))
qspi.rnode := pbus.toVariableWidthSlaves
- qspi.fnode :=
- TLFragmenter(1, pbus.blockBytes)(
- TLBuffer(BufferParams(params.fBufferDepth), BufferParams.none)(
-
pbus.toFixedWidthSlaves)
)
+ (qspi.fnode
+ := TLFragmenter(1, pbus.blockBytes)
+ := TLBuffer(BufferParams(params.fBufferDepth), BufferParams.none)
+
:= pbus.toFixedWidthSlaves
)
ibus.fromSync := qspi.intnode
qspi
}
ibus.fromSync := qspi.intnode
qspi
}