Merge of DPRINTF fixes from head.

--HG--
extra : convert_revision : f99a33b2df6a6c5592856d17d00e73ee83267442

diff --cc src/dev/alpha/tsunami_cchip.cc
Simple merge

diff --cc src/dev/io_device.cc
index 806d13d079bf81387fc105ffffc7786781d9877d,be5756ab7bc3a2d27ddce8dbf112bdc6f021c2da..85d78ee8d25d4bec50d7d9e633aecc777f2275f8
--- 1/src/dev/io_device.cc
--- 2/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@@ -100,9 -100,11 +100,9 @@@ DmaPort::DmaPort(DmaDevice *dev, Syste
  bool
  DmaPort::recvTiming(PacketPtr pkt)
  {
 -
 -
 -    if (pkt->result == Packet::Nacked) {
 +    if (pkt->wasNacked()) {
-         DPRINTF(DMA, "Received nacked Pkt %#x with State: %#x Addr: %#x\n",
-                pkt, pkt->senderState, pkt->getAddr());
+         DPRINTF(DMA, "Received nacked %s addr %#x\n",
+                 pkt->cmdString(), pkt->getAddr());
  
          if (backoffTime < device->minBackoffDelay)
              backoffTime = device->minBackoffDelay;

diff --cc src/mem/bridge.cc
index 92beb3d7edbda9ec5b8250bc01ac87345e188a06,8bc32711df4df31d1a14979149c1f067806dde4d..d6adb05d13eb71fd2c31393b184b3d5f2f110bf1
--- 1/src/mem/bridge.cc
--- 2/src/mem/bridge.cc
+++ b/src/mem/bridge.cc
@@@ -205,13 -210,10 +205,10 @@@ Bridge::BridgePort::queueForSendTiming(
  
          // Check if this packet was expecting a response and it's a nacked
          // packet, in which case we will never being seeing it
 -        if (buf->expectResponse && pkt->result == Packet::Nacked)
 +        if (buf->expectResponse && pkt->wasNacked())
              --outstandingResponses;
  
- 
-         DPRINTF(BusBridge, "restoring  sender state: %#X, from packet buffer: %#X\n",
-                         pkt->senderState, buf);
-         DPRINTF(BusBridge, "  is response, new dest %d\n", pkt->getDest());
+         DPRINTF(BusBridge, "response, new dest %d\n", pkt->getDest());
          delete buf;
      }
  

diff --cc src/mem/bus.cc
Simple merge