Merge zizzer.eecs.umich.edu:/bk/newmem

into  zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus

--HG--
extra : convert_revision : 8b5536f276527adcc27e11e790262232aeb61b13

1 files changed, 14 insertions, 2 deletions

diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index 941389296..9dd666304 100644
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -51,6 +51,14 @@ class Bus : public MemObject
 {
     /** a globally unique id for this bus. */
     int busId;
+    /** the clock speed for the bus */
+    int clock;
+    /** the width of the bus in bits */
+    int width;
+    /** the last tick the address bus was used */
+    Tick tickAddrLastUsed;
+    /** the last tick the data bus was used */
+    Tick tickDataLastUsed;
 
     static const int defaultId = -1;
 
@@ -199,8 +207,12 @@ class Bus : public MemObject
 
     virtual void init();
 
-    Bus(const std::string &n, int bus_id)
-        : MemObject(n), busId(bus_id), defaultPort(NULL)  {}
+    Bus(const std::string &n, int bus_id, int _clock, int _width)
+        : MemObject(n), busId(bus_id), clock(_clock), width(_width),
+        tickAddrLastUsed(0), tickDataLastUsed(0), defaultPort(NULL)
+    {
+        assert(width);
+    }
 
 };