Rename port methods:

sendBlockSizeQuery() -> peerBlockSize()
recvBlockSizeQuery() -> deviceBlockSize()
After seeing how this gets used in practice, the
send/recv*Query names just don't make a lot of sense.

dev/io_device.cc:
mem/port.cc:
    sendBlockSizeQuery() -> peerBlockSize()
mem/port.hh:
    sendBlockSizeQuery() -> peerBlockSize()
    recvBlockSizeQuery() -> deviceBlockSize()

--HG--
extra : convert_revision : e96349fb443979b85899a5248bd7cd8665e23ef0

diff --git a/dev/io_device.cc b/dev/io_device.cc
index 1ed2a060aa0678ea2bf8d7d7c4cfde72dd03e72a..b580c28057dbadb8f6db02dc8ff5a49757205482 100644 (file)
--- 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 8ce1831dbabe311a7fca6cc692ee97d92d3ff1f6..640b72a0e7905ee2dadca589643e9be20060a381 100644 (file)
--- 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 d7a0faba22b6f2768148c6b355c8ff1a7879007c..3098b663ccc6685c712ecd24fc7abe226748c93f 100644 (file)
--- 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.