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.
This commit is contained in:
Andreas Hansson 2012-09-21 10:11:24 -04:00
parent 166afc43e0
commit 4aee3aa073
3 changed files with 9 additions and 17 deletions

View file

@ -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

View file

@ -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()
{

View file

@ -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);