summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-11-07 14:24:31 -0500
committerKevin Lim <ktlim@umich.edu>2006-11-07 14:24:31 -0500
commit244e0c884c60c141ea1bc63bb93e0aee25d6a854 (patch)
tree750339e9f4a9026b9365e5e52e600adc53afbe27 /src
parent4589ec55aed596a4b0b7d81779f2b4665643d223 (diff)
downloadgem5-244e0c884c60c141ea1bc63bb93e0aee25d6a854.tar.xz
Remove hack by setting configuration better.
src/dev/isa_fake.cc: src/dev/isa_fake.hh: No need for specialized init() function any more. src/python/m5/objects/Tsunami.py: Override responder when set by user. This avoids having bus.responder floating around and not doing anything when the user has specified their own default responder. --HG-- extra : convert_revision : c547daf15b23a889c98e62bfd53c293c85d7a041
Diffstat (limited to 'src')
-rw-r--r--src/dev/isa_fake.cc9
-rw-r--r--src/dev/isa_fake.hh2
-rw-r--r--src/python/m5/objects/Tsunami.py1
3 files changed, 1 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 c4072e42c..e35b9c58f 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__
diff --git a/src/python/m5/objects/Tsunami.py b/src/python/m5/objects/Tsunami.py
index 78ab65b31..ffe93727b 100644
--- a/src/python/m5/objects/Tsunami.py
+++ b/src/python/m5/objects/Tsunami.py
@@ -76,6 +76,7 @@ class Tsunami(Platform):
self.pchip.pio = bus.port
self.pciconfig.pio = bus.default
bus.responder_set = True
+ bus.responder = self.pciconfig
self.fake_sm_chip.pio = bus.port
self.fake_uart1.pio = bus.port
self.fake_uart2.pio = bus.port