diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-07 02:16:37 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-07 02:16:37 -0800 |
| commit | 241cc0c8402f1b9f2ec20d1cc152d96930959b2a (patch) | |
| tree | 666717370cc9db4775ef46c10f7d8a92a34f40e2 /src/dev/io_device.cc | |
| parent | ec936364b7238cddea7734ea79c6e04b52a683c6 (diff) | |
| parent | 4b772782871f265cf7372c984ad750803396938c (diff) | |
| download | gem5-241cc0c8402f1b9f2ec20d1cc152d96930959b2a.tar.xz | |
Another merge with the main repository.
Diffstat (limited to 'src/dev/io_device.cc')
| -rw-r--r-- | src/dev/io_device.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc index 942b835f0..f124767ca 100644 --- a/src/dev/io_device.cc +++ b/src/dev/io_device.cc @@ -142,13 +142,9 @@ DmaPort::recvTiming(PacketPtr pkt) pkt->reinitNacked(); queueDma(pkt, true); + } else if (pkt->isRequest() && recvSnoops) { + return true; } else if (pkt->senderState) { - if (recvSnoops) { - if (pkt->isRequest()) { - return true; - } - } - DmaReqState *state; backoffTime >>= 2; |