diff options
| -rw-r--r-- | dev/io_device.cc | 3 | ||||
| -rw-r--r-- | mem/port.cc | 4 | ||||
| -rw-r--r-- | mem/port.hh | 7 |
3 files changed, 9 insertions, 5 deletions
diff --git a/dev/io_device.cc b/dev/io_device.cc index 1ed2a060a..b580c2805 100644 --- a/dev/io_device.cc +++ b/dev/io_device.cc @@ -98,7 +98,8 @@ DmaPort::dmaAction(Memory::Command cmd, DmaPort port, Addr addr, int size, completionEvent = event; - for (ChunkGenerator gen(addr, size, sendBlockSizeQuery()); !gen.done(); gen.next()) { + for (ChunkGenerator gen(addr, size, peerBlockSize()); + !gen.done(); gen.next()) { Packet *pkt = new Packet(basePkt); Request *req = new Request(baseReq); pkt->addr = gen.addr(); diff --git a/mem/port.cc b/mem/port.cc index 8ce1831db..640b72a0e 100644 --- a/mem/port.cc +++ b/mem/port.cc @@ -41,8 +41,8 @@ Port::blobHelper(Addr addr, uint8_t *p, int size, Command cmd) pkt.req = &rqst; pkt.cmd = cmd; - for (ChunkGenerator gen(addr, size, sendBlockSizeQuery()); !gen.done(); gen.next()) - { + for (ChunkGenerator gen(addr, size, peerBlockSize()); + !gen.done(); gen.next()) { pkt.addr = rqst.paddr = gen.addr(); pkt.size = rqst.size = gen.size(); pkt.data = p; diff --git a/mem/port.hh b/mem/port.hh index d7a0faba2..3098b663c 100644 --- a/mem/port.hh +++ b/mem/port.hh @@ -86,6 +86,9 @@ class Port protected: + /** These functions are protected because they should only be + * called by a peer port, never directly by any outside object. */ + /** Called to recive a timing call from the peer port. */ virtual bool recvTiming(Packet &pkt) = 0; @@ -109,7 +112,7 @@ class Port this function to be called, a DMA interface doesn't really have a block size, so it is defaulted to a panic. */ - virtual int recvBlockSizeQuery() { panic("??"); } + virtual int deviceBlockSize() { panic("??"); } /** The peer port is requesting us to reply with a list of the ranges we are responsible for. @@ -164,7 +167,7 @@ class Port /** Called by the associated device if it wishes to find out the blocksize of the device on attached to the peer port. */ - int sendBlockSizeQuery() { return peer->recvBlockSizeQuery(); } + int peerBlockSize() { return peer->deviceBlockSize(); } /** Called by the associated device if it wishes to find out the address ranges connected to the peer ports devices. |