2c2
< * Copyright (c) 2012-2013 ARM Limited
---
> * Copyright (c) 2012-2013, 2015 ARM Limited
57a58,97
> protected:
>
> /**
> * A snooping DMA port that currently does nothing besides
> * extending the DMA port to accept snoops without
> * complaining. Currently we take no action on any snoops.
> */
> class SnoopingDmaPort : public DmaPort
> {
>
> protected:
>
> virtual void recvTimingSnoopReq(PacketPtr pkt)
> { }
>
> virtual Tick recvAtomicSnoop(PacketPtr pkt)
> { return 0; }
>
> virtual void recvFunctionalSnoop(PacketPtr pkt)
> { }
>
> virtual bool isSnooping() const { return true; }
>
> public:
>
> /**
> * A snooping DMA port merely calls the construtor of the DMA
> * port.
> */
> SnoopingDmaPort(MemObject *dev, System *s) :
> DmaPort(dev, s)
> { }
> };
>
> /** Port to issue translation requests from */
> SnoopingDmaPort port;
>
> /** Request id for requests generated by this MMU */
> MasterID masterId;
>
98a139,147
> /**
> * Get the port that ultimately belongs to the stage-two MMU, but
> * is used by the two table walkers, and is exposed externally and
> * connected through the stage-one table walker.
> */
> DmaPort& getPort() { return port; }
>
> unsigned int drain(DrainManager *dm);
>
100,101c149
< uint8_t *data, int numBytes, Request::Flags flags, int masterId,
< bool isFunctional);
---
> uint8_t *data, int numBytes, Request::Flags flags, bool isFunctional);
103,104c151,152
< Stage2Translation *translation, int numBytes, Request::Flags flags,
< int masterId);
---
> Stage2Translation *translation, int numBytes,
> Request::Flags flags);