From: Kevin Lim <ktlim@umich.edu>
Date: Thu, 2 Nov 2006 20:20:47 +0000 (-0500)
Subject: Merge ktlim@zizzer:/bk/newmem
X-Git-Tag: m5_2.0_beta2~53^2~67
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e71ccde66369951c23eb20281c68a8cb66c4a504;p=gem5.git

Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

--HG--
extra : convert_revision : a9a41e2c292bd95aa148e1cf4d9a77c0622a462b
---

e71ccde66369951c23eb20281c68a8cb66c4a504
diff --cc src/mem/bus.hh
index 27624b378,619720a79..1d1cfde89
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@@ -249,11 -250,11 +252,13 @@@ class Bus : public MemObjec
  
      virtual void init();
  
 +    unsigned int drain(Event *de);
 +
-     Bus(const std::string &n, int bus_id, int _clock, int _width)
+     Bus(const std::string &n, int bus_id, int _clock, int _width,
+         bool responder_set)
          : MemObject(n), busId(bus_id), clock(_clock), width(_width),
-         tickNextIdle(0), busIdle(this), inRetry(false), defaultPort(NULL)
+           tickNextIdle(0), busIdle(this), inRetry(false), defaultPort(NULL),
+           responderSet(responder_set)
      {
          //Both the width and clock period must be positive
          if (width <= 0)