diff -r 53259e232512 -r 7cd72272f04d src/mem/bus.hh --- a/src/mem/bus.hh Fri May 25 12:39:08 2012 +0100 +++ b/src/mem/bus.hh Fri May 25 17:47:43 2012 +0100 @@ -262,12 +262,11 @@ * presented with a packet from a specific port. If so, the port * in question is also added to the retry list. * - * @param pkt Incoming packet * @param port Source port on the bus presenting the packet * * @return True if the bus is to be considered occupied */ - bool isOccupied(PacketPtr pkt, Port* port); + bool isOccupied(Port* port); /** * Deal with a destination port accepting a packet by potentially diff -r 53259e232512 -r 7cd72272f04d src/mem/bus.cc --- a/src/mem/bus.cc Fri May 25 12:39:08 2012 +0100 +++ b/src/mem/bus.cc Fri May 25 17:47:43 2012 +0100 @@ -184,7 +184,7 @@ } bool -Bus::isOccupied(PacketPtr pkt, Port* port) +Bus::isOccupied(Port* port) { // first we see if the next idle tick is in the future, next the // bus is considered occupied if there are ports on the retry list @@ -204,8 +204,8 @@ SlavePort *src_port = slavePorts[slave_port_id]; // test if the bus should be considered occupied for the current - // packet, and exclude express snoops from the check - if (!pkt->isExpressSnoop() && isOccupied(pkt, src_port)) { + // port, and exclude express snoops from the check + if (!pkt->isExpressSnoop() && isOccupied(src_port)) { DPRINTF(Bus, "recvTimingReq: src %s %s 0x%x BUSY\n", src_port->name(), pkt->cmdString(), pkt->getAddr()); return false; @@ -277,8 +277,8 @@ MasterPort *src_port = masterPorts[master_port_id]; // test if the bus should be considered occupied for the current - // packet - if (isOccupied(pkt, src_port)) { + // port + if (isOccupied(src_port)) { DPRINTF(Bus, "recvTimingResp: src %s %s 0x%x BUSY\n", src_port->name(), pkt->cmdString(), pkt->getAddr()); return false; @@ -343,7 +343,9 @@ // determine the source port based on the id SlavePort* src_port = slavePorts[slave_port_id]; - if (isOccupied(pkt, src_port)) { + // test if the bus should be considered occupied for the current + // port + if (isOccupied(src_port)) { DPRINTF(Bus, "recvTimingSnoopResp: src %s %s 0x%x BUSY\n", src_port->name(), pkt->cmdString(), pkt->getAddr()); return false;