From 290dbc106e91ad224601f1289b7d00d0189af5b6 Mon Sep 17 00:00:00 2001 From: Tony Kao Date: Thu, 16 Nov 2017 15:02:13 -0500 Subject: [PATCH] Fixes GPIO width mismatch Adds explicit type to apbDecoder.slave to suppress IDE errors --- src/main/scala/vexriscv/demo/Murax.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/vexriscv/demo/Murax.scala b/src/main/scala/vexriscv/demo/Murax.scala index 95acf03..2653fb9 100644 --- a/src/main/scala/vexriscv/demo/Murax.scala +++ b/src/main/scala/vexriscv/demo/Murax.scala @@ -145,7 +145,7 @@ case class Murax(config : MuraxConfig) extends Component{ val jtag = slave(Jtag()) //Peripherals IO - val gpioA = master(TriStateArray(32 bits)) + val gpioA = master(TriStateArray(gpioWidth bits)) val uart = master(Uart()) } @@ -266,7 +266,7 @@ case class Murax(config : MuraxConfig) extends Component{ //******** Memory mappings ********* val apbDecoder = Apb3Decoder( master = apbBridge.io.apb, - slaves = List( + slaves = List[(Apb3, SizeMapping)]( gpioACtrl.io.apb -> (0x00000, 4 kB), uartCtrl.io.apb -> (0x10000, 4 kB), timer.io.apb -> (0x20000, 4 kB)