bus changes

src/mem/bus.cc:
src/mem/bus.hh:
    minor fix and some formatting changes
src/python/m5/objects/Bus.py:
    changed bits to bytes

--HG--
extra : convert_revision : dcd22205604b7a2727eaf2094084c4858f3589c5

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index 96f1152a6..f238f134d 100644
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -54,7 +54,7 @@ class Bus : public MemObject
     int busId;
     /** the clock speed for the bus */
     int clock;
-    /** the width of the bus in bits */
+    /** the width of the bus in bytes */
     int width;
     /** the next tick at which the bus will be idle */
     Tick tickNextIdle;
@@ -230,7 +230,7 @@ class Bus : public MemObject
         } else {
             // The device was retrying a packet. It didn't work, so we'll leave
             // it at the head of the retry list.
-            retryingPort = 0;
+            retryingPort = NULL;
 
             // We shouldn't be receiving a packet from one port when a different
             // one is retrying.
@@ -250,7 +250,7 @@ class Bus : public MemObject
 
     Bus(const std::string &n, int bus_id, int _clock, int _width)
         : MemObject(n), busId(bus_id), clock(_clock), width(_width),
-        tickNextIdle(0), busIdle(this), retryingPort(0), defaultPort(NULL)
+        tickNextIdle(0), busIdle(this), retryingPort(NULL), defaultPort(NULL)
     {
         //Both the width and clock period must be positive
         assert(width);