From cfbfa6b8952b1621ce264fd342ee1b0cfba68cf2 Mon Sep 17 00:00:00 2001
From: Stephen Twigg <sdtwigg@eecs.berkeley.edu>
Date: Thu, 5 Sep 2013 19:22:34 -0700
Subject: [PATCH] Add errors due to merge issues. Note, DebugIO re-introduced
 here but slated for possible removal in later commits.

---
 rocket/src/main/scala/htif.scala | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/rocket/src/main/scala/htif.scala b/rocket/src/main/scala/htif.scala
index f27b8f13..6df4d28c 100644
--- a/rocket/src/main/scala/htif.scala
+++ b/rocket/src/main/scala/htif.scala
@@ -5,6 +5,11 @@ import Node._
 import uncore._
 import Util._
 
+class DebugIO extends Bundle
+{
+  val error_mode = Bool(OUTPUT)
+}
+
 class HostIO(val w: Int) extends Bundle
 {
   val clk = Bool(OUTPUT)
@@ -23,6 +28,7 @@ class PCRReq extends Bundle
 class HTIFIO(ntiles: Int) extends Bundle
 {
   val reset = Bool(INPUT)
+  val debug = new DebugIO
   val id = UInt(INPUT, log2Up(ntiles))
   val pcr_req = Decoupled(new PCRReq).flip
   val pcr_rep = Decoupled(Bits(width = 64))
@@ -32,14 +38,13 @@ class HTIFIO(ntiles: Int) extends Bundle
 
 class SCRIO(n: Int) extends Bundle
 {
-  val n = 64
   val rdata = Vec.fill(n){Bits(INPUT, 64)}
   val wen = Bool(OUTPUT)
   val waddr = UInt(OUTPUT, log2Up(n))
   val wdata = Bits(OUTPUT, 64)
 }
 
-class RocketHTIF(w: Int, nSCR: Int)(implicit conf: TileLinkConfiguration) extends Component with ClientCoherenceAgent
+class RocketHTIF(w: Int, nSCR: Int)(implicit conf: TileLinkConfiguration) extends Module with ClientCoherenceAgent
 {
   implicit val (ln, co) = (conf.ln, conf.co)
   val nTiles = ln.nClients-1 // This HTIF is itself a TileLink client