diff options
Diffstat (limited to 'src/dev')
| -rw-r--r-- | src/dev/io_device.cc | 9 | ||||
| -rw-r--r-- | src/dev/io_device.hh | 2 | ||||
| -rw-r--r-- | src/dev/x86/intdev.cc | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc index 5d6255f5c..f7b8db09d 100644 --- a/src/dev/io_device.cc +++ b/src/dev/io_device.cc @@ -36,9 +36,10 @@ #include "dev/io_device.hh" #include "sim/system.hh" -PioPort::PioPort(PioDevice *dev, System *s, std::string pname) - : SimpleTimingPort(dev->name() + pname, dev), device(dev) -{ } +PioPort::PioPort(PioDevice *dev) + : SimpleTimingPort(dev->name() + "-pioport", dev), device(dev) +{ +} Tick @@ -55,7 +56,7 @@ PioPort::getAddrRanges() PioDevice::PioDevice(const Params *p) - : MemObject(p), sys(p->system), pioPort(this, sys) + : MemObject(p), sys(p->system), pioPort(this) {} PioDevice::~PioDevice() diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh index d7ed93805..400263957 100644 --- a/src/dev/io_device.hh +++ b/src/dev/io_device.hh @@ -65,7 +65,7 @@ class PioPort : public SimpleTimingPort public: - PioPort(PioDevice *dev, System *s, std::string pname = "-pioport"); + PioPort(PioDevice *dev); }; diff --git a/src/dev/x86/intdev.cc b/src/dev/x86/intdev.cc index bcfab5fe4..0d038b93d 100644 --- a/src/dev/x86/intdev.cc +++ b/src/dev/x86/intdev.cc @@ -50,7 +50,7 @@ X86ISA::IntDev::IntPort::sendMessage(ApicList apics, TriggerIntMessage message, for (apicIt = apics.begin(); apicIt != apics.end(); apicIt++) { PacketPtr pkt = buildIntRequest(*apicIt, message); if (timing) { - schedSendTiming(pkt, curTick() + latency); + queue.schedSendTiming(pkt, curTick() + latency); // The target handles cleaning up the packet in timing mode. } else { // ignore the latency involved in the atomic transaction |