summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2005-06-02 11:19:01 -0400
committerNathan Binkert <binkertn@umich.edu>2005-06-02 11:19:01 -0400
commit0ee75f27b8d7bdc803ca2b30b578de7c3231cb84 (patch)
treeabe4bd6e96628f8cbdaaae991efbd382b78e512a /python
parent960672719a465397f2276ace8beac368ba512302 (diff)
downloadgem5-0ee75f27b8d7bdc803ca2b30b578de7c3231cb84.tar.xz
Fix-up some config issues
python/m5/config.py: Make NetworkBandwidth and MemoryBandwidth work python/m5/objects/Ethernet.py: Make 1Gbps default for ethernet --HG-- extra : convert_revision : 59e62f7e62624356ae8d7304598617f60667f040
Diffstat (limited to 'python')
-rw-r--r--python/m5/config.py4
-rw-r--r--python/m5/objects/Ethernet.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/python/m5/config.py b/python/m5/config.py
index f7b3f93ab..48d945d14 100644
--- a/python/m5/config.py
+++ b/python/m5/config.py
@@ -1212,7 +1212,7 @@ class NetworkBandwidth(float,ParamValue):
return str(self.val)
def ini_str(self):
- return '%f' % (ticks_per_sec / self.val)
+ return '%f' % (ticks_per_sec / float(self))
class MemoryBandwidth(float,ParamValue):
def __new__(self, value):
@@ -1223,7 +1223,7 @@ class MemoryBandwidth(float,ParamValue):
return str(self.val)
def ini_str(self):
- return '%f' % (ticks_per_sec / self.val)
+ return '%f' % (ticks_per_sec / float(self))
#
# "Constants"... handy aliases for various values.
diff --git a/python/m5/objects/Ethernet.py b/python/m5/objects/Ethernet.py
index c89505477..61386a08d 100644
--- a/python/m5/objects/Ethernet.py
+++ b/python/m5/objects/Ethernet.py
@@ -12,7 +12,7 @@ class EtherLink(SimObject):
int1 = Param.EtherInt("interface 1")
int2 = Param.EtherInt("interface 2")
delay = Param.Latency('0us', "packet transmit delay")
- speed = Param.NetworkBandwidth('100Mbps', "link speed")
+ speed = Param.NetworkBandwidth('1Gbps', "link speed")
dump = Param.EtherDump(NULL, "dump object")
class EtherBus(SimObject):