projects
/
sifive-blocks.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
072d0c1
)
jtag: The jtag interfaces have moved to a different package.
author
Megan Wachs
<megan@sifive.com>
Thu, 2 Mar 2017 22:46:34 +0000
(14:46 -0800)
committer
Megan Wachs
<megan@sifive.com>
Thu, 2 Mar 2017 22:46:34 +0000
(14:46 -0800)
src/main/scala/devices/gpio/JTAG.scala
patch
|
blob
|
history
diff --git
a/src/main/scala/devices/gpio/JTAG.scala
b/src/main/scala/devices/gpio/JTAG.scala
index 8734539839ca560f78e5a948f6ac2af06f7e3fe6..d16cf32363b865567e60c44ea4379ad16192185f 100644
(file)
--- a/
src/main/scala/devices/gpio/JTAG.scala
+++ b/
src/main/scala/devices/gpio/JTAG.scala
@@
-11,7
+11,7
@@
import Chisel._
// ------------------------------------------------------------
import config._
// ------------------------------------------------------------
import config._
-import j
unctions
.{JTAGIO}
+import j
tag
.{JTAGIO}
class JTAGPinsIO extends Bundle {
class JTAGPinsIO extends Bundle {
@@
-19,25
+19,22
@@
class JTAGPinsIO extends Bundle {
val TMS = new GPIOPin()
val TDI = new GPIOPin()
val TDO = new GPIOPin()
val TMS = new GPIOPin()
val TDI = new GPIOPin()
val TDO = new GPIOPin()
- val TRST
_
n = new GPIOPin()
+ val TRSTn = new GPIOPin()
}
}
-class JTAGGPIOPort(
drvTdo: Boolean = false
)(implicit p: Parameters) extends Module {
+class JTAGGPIOPort()(implicit p: Parameters) extends Module {
val io = new Bundle {
val io = new Bundle {
- val jtag = new JTAGIO(
drvTdo
)
+ val jtag = new JTAGIO()
val pins = new JTAGPinsIO()
}
io.jtag.TCK := GPIOInputPinCtrl(io.pins.TCK, pue = Bool(true)).asClock
io.jtag.TMS := GPIOInputPinCtrl(io.pins.TMS, pue = Bool(true))
io.jtag.TDI := GPIOInputPinCtrl(io.pins.TDI, pue = Bool(true))
val pins = new JTAGPinsIO()
}
io.jtag.TCK := GPIOInputPinCtrl(io.pins.TCK, pue = Bool(true)).asClock
io.jtag.TMS := GPIOInputPinCtrl(io.pins.TMS, pue = Bool(true))
io.jtag.TDI := GPIOInputPinCtrl(io.pins.TDI, pue = Bool(true))
- io.jtag.TRST := ~GPIOInputPinCtrl(io.pins.TRST_n, pue = Bool(true))
-
- GPIOOutputPinCtrl(io.pins.TDO, io.jtag.TDO)
- if (drvTdo) {
- io.pins.TDO.o.oe := io.jtag.DRV_TDO.get
- }
+ io.jtag.TRSTn := GPIOInputPinCtrl(io.pins.TRSTn, pue = Bool(true))
+ GPIOOutputPinCtrl(io.pins.TDO, io.jtag.TDO.data)
+ io.pins.TDO.o.oe := io.jtag.TDO.driven
}
}