summaryrefslogtreecommitdiff
path: root/src/dev/io_device.hh
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-07-06 14:41:09 -0400
committerAli Saidi <saidi@eecs.umich.edu>2006-07-06 14:41:09 -0400
commit4b741100714c6f20749f344ddd4b16459f28df72 (patch)
tree613d4bf11ced3c8df4b5bb2e9a68a3df04b11333 /src/dev/io_device.hh
parente60f998e2993df35460c8835016b3043a13da80a (diff)
parent93839380e7dc4799d234843d10329c03d38487fa (diff)
downloadgem5-4b741100714c6f20749f344ddd4b16459f28df72.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : 4669e87d29fa3e0ca9009f6b9dce72113220d7bc
Diffstat (limited to 'src/dev/io_device.hh')
-rw-r--r--src/dev/io_device.hh4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh
index a2b61c7f4..40edf6875 100644
--- a/src/dev/io_device.hh
+++ b/src/dev/io_device.hh
@@ -82,6 +82,8 @@ class PioPort : public Port
virtual void getDeviceAddressRanges(AddrRangeList &resp, AddrRangeList &snoop);
+ void resendNacked(Packet *pkt);
+
/**
* This class is used to implemented sendTiming() with a delay. When a delay
* is requested a new event is created. When the event time expires it
@@ -113,7 +115,7 @@ class PioPort : public Port
virtual void recvRetry();
public:
- PioPort(PioDevice *dev, Platform *p);
+ PioPort(PioDevice *dev, Platform *p, std::string pname = "-pioport");
friend class PioPort::SendEvent;
};