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

diff --git a/src/dev/isa_fake.cc b/src/dev/isa_fake.cc
index 103fdd8ce154ab739cf6c3bda0fed389790e2d83..40909c6a1e32fea414a7e4992d65a887fabdc2b4 100644 (file)
--- 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 c4072e42c3464a8f7b8088ba7e5bb1b0bceece61..e35b9c58f090e5f2cb0bdf8b51688898d493cf07 100644 (file)
--- 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 78ab65b319607a1853750fd611aa899031567230..ffe93727b21907923369d3c6fe68de24bbc26f82 100644 (file)
--- 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