diff options
Diffstat (limited to 'src/dev')
| -rw-r--r-- | src/dev/io_device.cc | 7 | ||||
| -rw-r--r-- | src/dev/io_device.hh | 27 |
2 files changed, 4 insertions, 30 deletions
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc index eb799f688..83d3af095 100644 --- a/src/dev/io_device.cc +++ b/src/dev/io_device.cc @@ -120,13 +120,12 @@ BasicPioDevice::getAddrRanges() } -DmaPort::DmaPort(MemObject *dev, System *s, Tick min_backoff, Tick max_backoff, - bool recv_snoops) - : MasterPort(dev->name() + "-dmaport", dev), device(dev), sys(s), +DmaPort::DmaPort(MemObject *dev, System *s, Tick min_backoff, Tick max_backoff) + : MasterPort(dev->name() + "-dma", dev), device(dev), sys(s), masterId(s->getMasterId(dev->name())), pendingCount(0), actionInProgress(0), drainEvent(NULL), backoffTime(0), minBackoffDelay(min_backoff), - maxBackoffDelay(max_backoff), inRetry(false), recvSnoops(recv_snoops), + maxBackoffDelay(max_backoff), inRetry(false), backoffEvent(this) { } diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh index 99b207595..0e6556a50 100644 --- a/src/dev/io_device.hh +++ b/src/dev/io_device.hh @@ -143,34 +143,10 @@ class DmaPort : public MasterPort * it is that it's sending. */ bool inRetry; - /** Port accesses a cache which requires snooping */ - bool recvSnoops; - virtual bool recvTimingResp(PacketPtr pkt); - virtual void recvTimingSnoopReq(PacketPtr pkt) - { - if (!recvSnoops) - panic("%s was not expecting a snoop\n", name()); - } - - virtual Tick recvAtomicSnoop(PacketPtr pkt) - { - if (!recvSnoops) - panic("%s was not expecting a snoop\n", name()); - return 0; - } - - virtual void recvFunctionalSnoop(PacketPtr pkt) - { - if (!recvSnoops) - panic("%s was not expecting a snoop\n", name()); - } - virtual void recvRetry() ; - virtual bool isSnooping() const { return recvSnoops; } - void queueDma(PacketPtr pkt, bool front = false); void sendDma(); @@ -178,8 +154,7 @@ class DmaPort : public MasterPort EventWrapper<DmaPort, &DmaPort::sendDma> backoffEvent; public: - DmaPort(MemObject *dev, System *s, Tick min_backoff, Tick max_backoff, - bool recv_snoops = false); + DmaPort(MemObject *dev, System *s, Tick min_backoff, Tick max_backoff); void dmaAction(Packet::Command cmd, Addr addr, int size, Event *event, uint8_t *data, Tick delay, Request::Flags flag = 0); |