ruby: move stall and wakeup functions to AbstractController

[gem5.git] / src / mem / bus.hh

diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index 015bb51a04003adc0061c91f3e945119587ee991..705a3a999cd2a9d6df943b49cd8abd717a4db14d 100644 (file)
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -232,6 +232,9 @@ class BaseBus : public MemObject
     typedef AddrRangeMap<PortID>::const_iterator PortMapConstIter;
     AddrRangeMap<PortID> portMap;
 
+    /** all contigous ranges seen by this bus */
+    AddrRangeList busRanges;
+
     AddrRange defaultRange;
 
     /**
@@ -302,12 +305,13 @@ class BaseBus : public MemObject
      */
     AddrRangeList getAddrRanges() const;
 
-    /** Calculate the timing parameters for the packet.  Updates the
-     * firstWordTime and finishTime fields of the packet object.
-     * Returns the tick at which the packet header is completed (which
-     * will be all that is sent if the target rejects the packet).
+    /**
+     * Calculate the timing parameters for the packet. Updates the
+     * busFirstWordDelay and busLastWordDelay fields of the packet
+     * object with the relative number of ticks required to transmit
+     * the header and the first word, and the last word, respectively.
      */
-    Tick calcPacketTiming(PacketPtr pkt);
+    void calcPacketTiming(PacketPtr pkt);
 
     /**
      * Ask everyone on the bus what their size is and determine the