diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/io_device.cc | 12 | ||||
| -rw-r--r-- | dev/io_device.hh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dev/io_device.cc b/dev/io_device.cc index 268484e57..5f5f9a09d 100644 --- a/dev/io_device.cc +++ b/dev/io_device.cc @@ -30,8 +30,8 @@ #include "sim/builder.hh" -PioPort::PioPort(PioDevice *dev) - : device(dev) +PioPort::PioPort(PioDevice *dev, Platform *p) + : device(dev), platform(p) { } @@ -75,7 +75,7 @@ PioPort::SendEvent::process() PioDevice::PioDevice(const std::string &name, Platform *p) : SimObject(name), platform(p) { - pioPort = new PioPort(this); + pioPort = new PioPort(this, p); } @@ -83,7 +83,7 @@ bool PioPort::recvTiming(Packet &pkt) { device->recvAtomic(pkt); - sendTiming(pkt, pkt.req->responseTime-pkt.req->requestTime); + sendTiming(pkt, pkt.time-pkt.req->time); return Success; } @@ -148,7 +148,7 @@ DmaPort::dmaAction(Command cmd, DmaPort port, Addr addr, int size, basePkt.result = Unknown; basePkt.req = NULL; baseReq.nicReq = true; - baseReq.requestTime = curTick; + baseReq.time = curTick; completionEvent = event; @@ -183,7 +183,7 @@ DmaPort::sendDma(Packet &pkt) transmitList.push_back(&packet); } else if (state == Atomic) {*/ sendAtomic(pkt); - completionEvent->schedule(pkt.req->responseTime - pkt.req->requestTime); + completionEvent->schedule(pkt.time - pkt.req->time); completionEvent = NULL; /* } else if (state == Functional) { sendFunctional(pkt); diff --git a/dev/io_device.hh b/dev/io_device.hh index 8e44a1c00..b25048e3d 100644 --- a/dev/io_device.hh +++ b/dev/io_device.hh @@ -57,7 +57,7 @@ class PioPort : public Port /** The platform that device/port are in. This is used to select which mode * we are currently operating in. */ - Platfrom *platform; + Platform *platform; /** A list of outgoing timing response packets that haven't been serviced * yet. */ |