Merge pull request #1256 from freechipsproject/json_emit_enums
RegFieldDesc: Emit enumerations into JSON if they exist
This commit is contained in:
commit
cdd2a9227f
@ -26,7 +26,7 @@ case class RegFieldDesc (
|
|||||||
groupDesc: Option[String] = None,
|
groupDesc: Option[String] = None,
|
||||||
access: RegFieldAccessType = RegFieldAccessType.RW,
|
access: RegFieldAccessType = RegFieldAccessType.RW,
|
||||||
reset: Option[BigInt] = None,
|
reset: Option[BigInt] = None,
|
||||||
enumerations: Map[String, BigInt] = Map()
|
enumerations: Map[BigInt, (String, String)] = Map()
|
||||||
){
|
){
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,7 +97,13 @@ case class TLRegisterNode(
|
|||||||
("resetValue" -> f.desc.map{_.reset}) ~
|
("resetValue" -> f.desc.map{_.reset}) ~
|
||||||
("group" -> f.desc.map{_.group}) ~
|
("group" -> f.desc.map{_.group}) ~
|
||||||
("groupDesc" -> f.desc.map{_.groupDesc}) ~
|
("groupDesc" -> f.desc.map{_.groupDesc}) ~
|
||||||
("accessType" -> f.desc.map {d => d.access.toString})
|
("accessType" -> f.desc.map {d => d.access.toString}) ~
|
||||||
|
("enumerations" -> f.desc.map {d =>
|
||||||
|
Option(d.enumerations.map { case (key, (name, desc)) =>
|
||||||
|
(("value" -> key) ~
|
||||||
|
("name" -> name) ~
|
||||||
|
("description" -> desc))
|
||||||
|
}).filter(_.nonEmpty)})
|
||||||
))
|
))
|
||||||
currentBitOffset = currentBitOffset + f.width
|
currentBitOffset = currentBitOffset + f.width
|
||||||
tmp
|
tmp
|
||||||
|
Loading…
Reference in New Issue
Block a user