From 4aee3aa073f9a20fff88daf0dd224e5c11d84b4e Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Fri, 21 Sep 2012 10:11:24 -0400
Subject: [PATCH] Mem: Tidy up bus member variables types

This patch merely tidies up the types used for the bus member
variables. It also makes the constant ones const.
---
 src/mem/Bus.py |  6 +++---
 src/mem/bus.cc | 10 +---------
 src/mem/bus.hh | 10 +++++-----
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/mem/Bus.py b/src/mem/Bus.py
index d24cefa62..447fc723e 100644
--- a/src/mem/Bus.py
+++ b/src/mem/Bus.py
@@ -50,9 +50,9 @@ class BaseBus(MemObject):
     # Override the default clock
     clock = '1GHz'
     header_cycles = Param.Cycles(1, "cycles of overhead per transaction")
-    width = Param.Int(8, "bus width (bytes)")
-    block_size = Param.Int(64, "The default block size if not set by " \
-                               "any connected module")
+    width = Param.Unsigned(8, "bus width (bytes)")
+    block_size = Param.Unsigned(64, "The default block size if not set by " \
+                                    "any connected module")
 
     # The default port can be left unconnected, or be used to connect
     # a default slave port
diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index ba45bfcb5..4dfcbad1c 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -61,15 +61,7 @@ BaseBus::BaseBus(const BaseBusParams *p)
       useDefaultRange(p->use_default_range),
       defaultBlockSize(p->block_size),
       cachedBlockSize(0), cachedBlockSizeValid(false)
-{
-    //width, clock period, and header cycles must be positive
-    if (width <= 0)
-        fatal("Bus width must be positive\n");
-    if (clock <= 0)
-        fatal("Bus clock period must be positive\n");
-    if (headerCycles <= 0)
-        fatal("Number of header cycles must be positive\n");
-}
+{}
 
 BaseBus::~BaseBus()
 {
diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index 541e2f363..95699cf22 100644
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -228,9 +228,9 @@ class BaseBus : public MemObject
     };
 
     /** cycles of overhead per transaction */
-    int headerCycles;
+    const Cycles headerCycles;
     /** the width of the bus in bytes */
-    int width;
+    const uint32_t width;
 
     typedef AddrRangeMap<PortID>::iterator PortMapIter;
     typedef AddrRangeMap<PortID>::const_iterator PortMapConstIter;
@@ -346,10 +346,10 @@ class BaseBus : public MemObject
        address not handled by another port and not in default device's
        range will cause a fatal error.  If false, just send all
        addresses not handled by another port to default device. */
-    bool useDefaultRange;
+    const bool useDefaultRange;
 
-    unsigned defaultBlockSize;
-    unsigned cachedBlockSize;
+    const uint32_t defaultBlockSize;
+    uint32_t cachedBlockSize;
     bool cachedBlockSizeValid;
 
     BaseBus(const BaseBusParams *p);