diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-08-04 20:27:23 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-08-04 20:27:23 -0700 |
| commit | cae8d20633c0f43fdae23576adfb894284a7ee86 (patch) | |
| tree | e9e232684d7fc024900d8a07d6b8a3add1f52e92 /src/dev/pcidev.cc | |
| parent | 30e777a5d3829975266ecccac965d2297a5f4985 (diff) | |
| parent | df015f17a45b18302565c43d3790d787e1b54c42 (diff) | |
| download | gem5-cae8d20633c0f43fdae23576adfb894284a7ee86.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : 3edb9f03353b18b4c9f062bccf11e79cfb3c15f2
Diffstat (limited to 'src/dev/pcidev.cc')
| -rw-r--r-- | src/dev/pcidev.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/dev/pcidev.cc b/src/dev/pcidev.cc index ef70c7f8d..9efee2835 100644 --- a/src/dev/pcidev.cc +++ b/src/dev/pcidev.cc @@ -67,7 +67,6 @@ PciDev::PciConfigPort::PciConfigPort(PciDev *dev, int busid, int devid, Tick PciDev::PciConfigPort::recvAtomic(PacketPtr pkt) { - assert(pkt->result == Packet::Unknown); assert(pkt->getAddr() >= configAddr && pkt->getAddr() < configAddr + PCI_CONFIG_SIZE); return pkt->isRead() ? device->readConfig(pkt) : device->writeConfig(pkt); @@ -155,7 +154,7 @@ PciDev::readConfig(PacketPtr pkt) default: panic("invalid access size(?) for PCI configspace!\n"); } - pkt->result = Packet::Success; + pkt->makeAtomicResponse(); return configDelay; } @@ -282,9 +281,8 @@ PciDev::writeConfig(PacketPtr pkt) default: panic("invalid access size(?) for PCI configspace!\n"); } - pkt->result = Packet::Success; + pkt->makeAtomicResponse(); return configDelay; - } void |