diff options
Diffstat (limited to 'src/dev')
| -rw-r--r-- | src/dev/io_device.cc | 7 | ||||
| -rw-r--r-- | src/dev/io_device.hh | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc index 5fadb2f49..eb799f688 100644 --- a/src/dev/io_device.cc +++ b/src/dev/io_device.cc @@ -131,9 +131,8 @@ DmaPort::DmaPort(MemObject *dev, System *s, Tick min_backoff, Tick max_backoff, { } bool -DmaPort::recvTiming(PacketPtr pkt) +DmaPort::recvTimingResp(PacketPtr pkt) { - assert(pkt->isResponse()); if (pkt->wasNacked()) { DPRINTF(DMA, "Received nacked %s addr %#x\n", pkt->cmdString(), pkt->getAddr()); @@ -234,7 +233,7 @@ DmaPort::recvRetry() PacketPtr pkt = transmitList.front(); DPRINTF(DMA, "Retry on %s addr %#x\n", pkt->cmdString(), pkt->getAddr()); - result = sendTiming(pkt); + result = sendTimingReq(pkt); if (result) { DPRINTF(DMA, "-- Done\n"); transmitList.pop_front(); @@ -320,7 +319,7 @@ DmaPort::sendDma() bool result; do { - result = sendTiming(pkt); + result = sendTimingReq(pkt); if (result) { transmitList.pop_front(); DPRINTF(DMA, "-- Done\n"); diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh index b113f4379..99b207595 100644 --- a/src/dev/io_device.hh +++ b/src/dev/io_device.hh @@ -146,13 +146,12 @@ class DmaPort : public MasterPort /** Port accesses a cache which requires snooping */ bool recvSnoops; - virtual bool recvTiming(PacketPtr pkt); + virtual bool recvTimingResp(PacketPtr pkt); - virtual bool recvTimingSnoop(PacketPtr pkt) + virtual void recvTimingSnoopReq(PacketPtr pkt) { if (!recvSnoops) panic("%s was not expecting a snoop\n", name()); - return true; } virtual Tick recvAtomicSnoop(PacketPtr pkt) |