From bf9b81f2bcaed9ed561906f66668dc98027671f8 Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Thu, 2 Mar 2017 14:46:34 -0800 Subject: [PATCH] jtag: The jtag interfaces have moved to a different package. --- src/main/scala/devices/gpio/JTAG.scala | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/scala/devices/gpio/JTAG.scala b/src/main/scala/devices/gpio/JTAG.scala index 8734539..d16cf32 100644 --- 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 junctions.{JTAGIO} +import jtag.{JTAGIO} 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 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 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)) - 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 } -- 2.30.2