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

jtag: Get rid of chisel deprecation warnings

Browse Source
This commit is contained in:
Megan Wachs 2017-04-07 11:48:54 -07:00 committed by Andrew Waterman
parent 22c6f728c3
commit 9ae4838708
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/jtag/JtagStateMachine.scala
View File

@ -36,7 +36,7 @@ object JtagState {
Exit2IR, Exit2IR,
UpdateIR UpdateIR
) )
val width = log2Up(all.size) val width = log2Ceil(all.size)
def chiselType() = UInt(width.W) def chiselType() = UInt(width.W)
} }

4
src/main/scala/jtag/Utils.scala
View File

@ -48,14 +48,14 @@ class ClockedCounter(modClock: Clock, counts: BigInt, init: Option[BigInt])
extends Module(override_clock=Some(modClock)) { extends Module(override_clock=Some(modClock)) {
require(counts > 0, "really?") require(counts > 0, "really?")
val width = log2Up(counts) val width = log2Ceil(counts)
class CountIO extends Bundle { class CountIO extends Bundle {
val count = Output(UInt(width.W)) val count = Output(UInt(width.W))
} }
val io = IO(new CountIO) val io = IO(new CountIO)
val count = init match { val count = init match {
case Some(init) => Reg(UInt(width.W), init=init.U) case Some(init) => RegInit(init.U(width.W))
case None => Reg(UInt(width.W)) case None => Reg(UInt(width.W))
} }