From 74d9326ebcf20bc4450130f6a514810771216ba3 Mon Sep 17 00:00:00 2001
From: Megan Wachs <megan@sifive.com>
Date: Mon, 18 Dec 2017 21:02:31 -0800
Subject: [PATCH] JTAG: Revert to Chisel._ for Issue 1160 (#1161)

* JTAG: Revert to Chisel._ for Issue 1160

* JTAG: Revert to Chisel._ for Issue 1160

* jtag: revert everything to Chisel._

* jtag: Revert all modules to Chisel._ vs chisel3, due to FIRRTL issues with chisel3 generated code
---
 src/main/scala/jtag/JtagShifter.scala      |  5 +++--
 src/main/scala/jtag/JtagStateMachine.scala |  7 ++++---
 src/main/scala/jtag/JtagTap.scala          | 15 ++++++++++-----
 src/main/scala/jtag/JtagUtils.scala        |  3 ++-
 src/main/scala/jtag/Utils.scala            |  5 +++--
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/main/scala/jtag/JtagShifter.scala b/src/main/scala/jtag/JtagShifter.scala
index 869d45b4..d2c4bb67 100644
--- a/src/main/scala/jtag/JtagShifter.scala
+++ b/src/main/scala/jtag/JtagShifter.scala
@@ -2,10 +2,11 @@
 
 package freechips.rocketchip.jtag
 
-import chisel3._
+//import chisel3._
+import Chisel._
+import chisel3.core.{Input, Output}
 import chisel3.core.DataMirror
 import chisel3.internal.firrtl.KnownWidth
-import chisel3.util._
 
 import freechips.rocketchip.config.Parameters
 import freechips.rocketchip.util.property._
diff --git a/src/main/scala/jtag/JtagStateMachine.scala b/src/main/scala/jtag/JtagStateMachine.scala
index 5e64b1e4..bf191d79 100644
--- a/src/main/scala/jtag/JtagStateMachine.scala
+++ b/src/main/scala/jtag/JtagStateMachine.scala
@@ -2,8 +2,8 @@
 
 package freechips.rocketchip.jtag
 
-import chisel3._
-import chisel3.util._
+import Chisel._
+import chisel3.{Input, Output}
 import freechips.rocketchip.config.{Parameters}
 import freechips.rocketchip.util.{AsyncResetRegVec}
 import freechips.rocketchip.util.property._
@@ -78,7 +78,8 @@ class JtagStateMachine(implicit val p: Parameters) extends Module(override_reset
   }
   val io = IO(new StateMachineIO)
 
-  val nextState = WireInit(JtagState.State.chiselType(), DontCare)
+  // val nextState = WireInit(JtagState.State.chiselType(), DontCare)
+  val nextState = Wire(JtagState.State.chiselType())
 
   val currStateReg = Module (new AsyncResetRegVec(w = JtagState.State.width,
     init = JtagState.State.toInt(JtagState.TestLogicReset)))
diff --git a/src/main/scala/jtag/JtagTap.scala b/src/main/scala/jtag/JtagTap.scala
index d97a6a33..733b4802 100644
--- a/src/main/scala/jtag/JtagTap.scala
+++ b/src/main/scala/jtag/JtagTap.scala
@@ -4,7 +4,10 @@ package freechips.rocketchip.jtag
 
 import scala.collection.SortedMap
 
-import chisel3._
+// !!! See Issue #1160.
+// import chisel3._
+import Chisel._
+import chisel3.core.{Input, Output}
 import chisel3.util._
 import freechips.rocketchip.config.Parameters
 
@@ -111,7 +114,8 @@ class JtagTapController(irLength: Int, initialInstruction: BigInt)(implicit val
     nextActiveInstruction := irChain.io.update.bits
     updateInstruction := true.B
   } .otherwise {
-    nextActiveInstruction := DontCare
+    //!!! Needed when using chisel3._ (See #1160)
+    // nextActiveInstruction := DontCare
     updateInstruction := false.B
   }
   io.output.instruction := activeInstruction
@@ -136,7 +140,8 @@ class JtagTapController(irLength: Int, initialInstruction: BigInt)(implicit val
     tdo := irChain.io.chainOut.data
     tdo_driven := true.B
   } .otherwise {
-    tdo := DontCare
+    //!!! Needed when using chisel3._ (See #1160)
+    //tdo := DontCare
     tdo_driven := false.B
   }
 }
@@ -247,8 +252,8 @@ object JtagTapGenerator {
     chainToSelect.map(mapInSelect)
 
     controllerInternal.io.jtag <> internalIo.jtag
-    controllerInternal.io.control <> internalIo.control
-    controllerInternal.io.output <> internalIo.output
+    internalIo.control <> controllerInternal.io.control
+    internalIo.output <> controllerInternal.io.output
 
     internalIo
   }
diff --git a/src/main/scala/jtag/JtagUtils.scala b/src/main/scala/jtag/JtagUtils.scala
index 035ee9ea..5b120dea 100644
--- a/src/main/scala/jtag/JtagUtils.scala
+++ b/src/main/scala/jtag/JtagUtils.scala
@@ -2,7 +2,8 @@
 
 package freechips.rocketchip.jtag
 
-import chisel3._
+import Chisel._
+//import chisel3._
 import chisel3.util._
 
 class JTAGIdcodeBundle extends Bundle {
diff --git a/src/main/scala/jtag/Utils.scala b/src/main/scala/jtag/Utils.scala
index 491de8cf..b6ae8128 100644
--- a/src/main/scala/jtag/Utils.scala
+++ b/src/main/scala/jtag/Utils.scala
@@ -2,8 +2,9 @@
 
 package freechips.rocketchip.jtag
 
-import chisel3._
-import chisel3.util._
+//import chisel3._
+import Chisel._
+import chisel3.core.{Input, Output}
 
 /** Bundle representing a tristate pin.
   */