summaryrefslogtreecommitdiff
path: root/dev/etherlink.cc
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2005-04-07 16:34:02 -0400
committerKevin Lim <ktlim@umich.edu>2005-04-07 16:34:02 -0400
commitdcedd7866e35adc1e0fbc081188b259ffc7bbdf5 (patch)
treefee54c1dcea007dc2e1256b8b56e87d812c5fd3d /dev/etherlink.cc
parentd261ee86c461a5feaefb432a54d56e2a393f4081 (diff)
parent9f2568f966a0ce36bfd7b3114aac1fcf419566c4 (diff)
downloadgem5-dcedd7866e35adc1e0fbc081188b259ffc7bbdf5.tar.xz
Hand merge
base/traceflags.py: Include new flags --HG-- extra : convert_revision : 8017cbe256860dce8b1efc1b4e1e81e883895b90
Diffstat (limited to 'dev/etherlink.cc')
-rw-r--r--dev/etherlink.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/etherlink.cc b/dev/etherlink.cc
index 81cdbc20f..ba0fa705c 100644
--- a/dev/etherlink.cc
+++ b/dev/etherlink.cc
@@ -52,7 +52,7 @@ EtherLink::EtherLink(const string &name, EtherInt *peer0, EtherInt *peer1,
: SimObject(name)
{
double rate = ((double)ticksPerSecond * 8.0) / (double)speed;
- Tick delay = US2Ticks(dly);
+ Tick delay = dly * Clock::Int::us;
link[0] = new Link(name + ".link0", this, 0, rate, delay, dump);
link[1] = new Link(name + ".link1", this, 1, rate, delay, dump);