summaryrefslogtreecommitdiff
path: root/src/mem/bus.cc
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2012-02-09 13:06:27 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2012-02-09 13:06:27 -0500
commitcdb32860b412f37a6c3c6881a81ec2c90876a504 (patch)
tree6558cee905d0423690cdd917ac8cf0c6190b7a2e /src/mem/bus.cc
parenta6246bb047a0527590519c35a5ffbd660c680991 (diff)
downloadgem5-cdb32860b412f37a6c3c6881a81ec2c90876a504.tar.xz
MEM: Remove onRetryList from BusPort and rely on retryList
This patch removes the onRetryList field from the BusPort class and entirely relies on the retryList which holds all ports that are waiting to retry. The onRetryList field and the retryList were previously used with overloaded functionalities and only one is really needed (there were also checks to assert they held the same information). After this patch the bus ports will be split into master and slave ports and this simplifies that transition.
Diffstat (limited to 'src/mem/bus.cc')
-rw-r--r--src/mem/bus.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index dfe4be3cc..e1f10860d 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 ARM Limited
+ * Copyright (c) 2011-2012 ARM Limited
* All rights reserved
*
* The license below extends only to copyright in the software and shall
@@ -255,7 +255,6 @@ Bus::recvTiming(PacketPtr pkt)
// Also take care of retries
if (inRetry) {
DPRINTF(Bus, "Remove retry from list %d\n", src);
- retryList.front()->onRetryList(false);
retryList.pop_front();
inRetry = false;
}
@@ -274,7 +273,6 @@ Bus::recvRetry(int id)
// If inRetry is still true, sendTiming wasn't called
if (inRetry)
{
- retryList.front()->onRetryList(false);
retryList.pop_front();
inRetry = false;