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

diff --git a/python/m5/config.py b/python/m5/config.py
index f7b3f93ab05aaeabaabab5450f687c0f7d208ec2..48d945d14094699d0521df8ff0c4185705b173f6 100644 (file)
--- 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 c89505477bc40ea6970530c343a4bc5d4cd5372d..61386a08d8c6bd31cf35c8569a6b277c67386272 100644 (file)
--- 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):