summaryrefslogtreecommitdiff
path: root/src/dev
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-11-08 16:18:10 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-11-08 16:18:10 -0500
commitf720029e97358b2f69ea0ecaace89d5c2ccc6bfe (patch)
tree49f739cbc78b842fc303c1a1296d293ca03ec961 /src/dev
parent5b90922ad59189f5967dc97a00bbfead062f4ba3 (diff)
parent74745cfeac4f4de4613d8faed77aa7e3c06cbca4 (diff)
downloadgem5-f720029e97358b2f69ea0ecaace89d5c2ccc6bfe.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops --HG-- extra : convert_revision : dc165840841bdd88e40111b98d1be493441703f0
Diffstat (limited to 'src/dev')
-rw-r--r--src/dev/isa_fake.cc9
-rw-r--r--src/dev/isa_fake.hh2
2 files changed, 0 insertions, 11 deletions
diff --git a/src/dev/isa_fake.cc b/src/dev/isa_fake.cc
index 103fdd8ce..40909c6a1 100644
--- a/src/dev/isa_fake.cc
+++ b/src/dev/isa_fake.cc
@@ -50,15 +50,6 @@ IsaFake::IsaFake(Params *p)
memset(&retData, p->retData, sizeof(retData));
}
-void
-IsaFake::init()
-{
- // Only init this device if it's connected to anything.
- if (pioPort)
- PioDevice::init();
-}
-
-
Tick
IsaFake::read(PacketPtr pkt)
{
diff --git a/src/dev/isa_fake.hh b/src/dev/isa_fake.hh
index 4c195a97f..fee41e325 100644
--- a/src/dev/isa_fake.hh
+++ b/src/dev/isa_fake.hh
@@ -80,8 +80,6 @@ class IsaFake : public BasicPioDevice
* @param data the data to not write.
*/
virtual Tick write(PacketPtr pkt);
-
- void init();
};
#endif // __ISA_FAKE_HH__