spi: work around ucb-bar/chisel3#472

diff --git a/src/main/scala/devices/spi/SPIConsts.scala b/src/main/scala/devices/spi/SPIConsts.scala
index b18b08a4acbaaed701253505d97fda22c8d1fb69..5d6dd0d15c0e4a0e24d1f2f2bfa9d4539ce2be09 100644 (file)
--- a/src/main/scala/devices/spi/SPIConsts.scala
+++ b/src/main/scala/devices/spi/SPIConsts.scala
@@ -5,29 +5,29 @@ import Chisel._
 
 object SPIProtocol {
   val width = 2
-  val Single = UInt(0, width)
-  val Dual   = UInt(1, width)
-  val Quad   = UInt(2, width)
+  def Single = UInt(0, width)
+  def Dual   = UInt(1, width)
+  def Quad   = UInt(2, width)
 
-  val cases = Seq(Single, Dual, Quad)
+  def cases = Seq(Single, Dual, Quad)
   def decode(x: UInt): Seq[Bool] = cases.map(_ === x)
 }
 
 object SPIDirection {
   val width = 1
-  val Rx = UInt(0, width)
-  val Tx = UInt(1, width)
+  def Rx = UInt(0, width)
+  def Tx = UInt(1, width)
 }
 
 object SPIEndian {
   val width = 1
-  val MSB = UInt(0, width)
-  val LSB = UInt(1, width)
+  def MSB = UInt(0, width)
+  def LSB = UInt(1, width)
 }
 
 object SPICSMode {
   val width = 2
-  val Auto = UInt(0, width)
-  val Hold = UInt(2, width)
-  val Off  = UInt(3, width)
+  def Auto = UInt(0, width)
+  def Hold = UInt(2, width)
+  def Off  = UInt(3, width)
 }

diff --git a/src/main/scala/devices/spi/SPIPhysical.scala b/src/main/scala/devices/spi/SPIPhysical.scala
index 6584be8b0272ccd016eb97fc38e97b44a1ff7f70..cb26bc99046e3dbeb273b376e397b31c611b5567 100644 (file)
--- a/src/main/scala/devices/spi/SPIPhysical.scala
+++ b/src/main/scala/devices/spi/SPIPhysical.scala
@@ -12,8 +12,8 @@ class SPIMicroOp(c: SPIConfigBase) extends SPIBundle(c) {
 }
 
 object SPIMicroOp {
-  val Transfer = UInt(0, 1)
-  val Delay    = UInt(1, 1)
+  def Transfer = UInt(0, 1)
+  def Delay    = UInt(1, 1)
 }
 
 class SPIPhyControl(c: SPIConfigBase) extends SPIBundle(c) {