5 files changed, 13 insertions, 88 deletions
diff --git a/src/dev/x86/SConscript b/src/dev/x86/SConscript
index 4071cc8bd..81a9441fb 100644
--- a/src/dev/x86/SConscript
+++ b/src/dev/x86/SConscript
@@ -64,6 +64,3 @@ if env['TARGET_ISA'] == 'x86':
     SimObject('I82094AA.py')
     Source('i82094aa.cc')
     DebugFlag('I82094AA')
-
-    Source('intdev.cc')
-    DebugFlag('IntDevice')
diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc
index dfadbd945..5daebe7b6 100644
--- a/src/dev/x86/i82094aa.cc
+++ b/src/dev/x86/i82094aa.cc
@@ -40,8 +40,9 @@
 #include "sim/system.hh"
 
 X86ISA::I82094AA::I82094AA(Params *p)
-    : BasicPioDevice(p, 20), IntDevice(this, p->int_latency),
-      extIntPic(p->external_int_pic), lowestPriorityOffset(0)
+    : BasicPioDevice(p, 20), extIntPic(p->external_int_pic),
+      lowestPriorityOffset(0),
+      intMasterPort(name() + ".int_master", this, this, p->int_latency)
 {
     // This assumes there's only one I/O APIC in the system and since the apic
     // id is stored in a 8-bit field with 0xff meaning broadcast, the id must
@@ -66,12 +67,13 @@ X86ISA::I82094AA::I82094AA(Params *p)
 void
 X86ISA::I82094AA::init()
 {
-    // The io apic must register its address ranges on both its pio port
-    // via the piodevice init() function and its int port that it inherited
-    // from IntDevice.  Note IntDevice is not a SimObject itself.
-
+    // The io apic must register its address range with its pio port via
+    // the piodevice init() function.
     BasicPioDevice::init();
-    IntDevice::init();
+
+    // If the master port isn't connected, we can't send interrupts anywhere.
+    panic_if(!intMasterPort.isConnected(),
+            "Int port not connected to anything!");
 }
 
 Port &
diff --git a/src/dev/x86/i82094aa.hh b/src/dev/x86/i82094aa.hh
index d9baf111a..b63fc4a68 100644
--- a/src/dev/x86/i82094aa.hh
+++ b/src/dev/x86/i82094aa.hh
@@ -45,7 +45,7 @@ namespace X86ISA
 class I8259;
 class Interrupts;
 
-class I82094AA : public BasicPioDevice, public IntDevice
+class I82094AA : public BasicPioDevice
 {
   public:
     BitUnion64(RedirTableEntry)
@@ -84,6 +84,8 @@ class I82094AA : public BasicPioDevice, public IntDevice
 
     std::vector<IntSinkPin<I82094AA> *> inputs;
 
+    IntMasterPort<I82094AA> intMasterPort;
+
   public:
     typedef I82094AAParams Params;
 
@@ -106,7 +108,7 @@ class I82094AA : public BasicPioDevice, public IntDevice
     Port &getPort(const std::string &if_name,
                   PortID idx=InvalidPortID) override;
 
-    bool recvResponse(PacketPtr pkt) override;
+    bool recvResponse(PacketPtr pkt);
 
     void signalInterrupt(int line);
     void raiseInterruptPin(int number);
diff --git a/src/dev/x86/intdev.cc b/src/dev/x86/intdev.cc
deleted file mode 100644
index fbc2d518c..000000000
--- a/src/dev/x86/intdev.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2012 ARM Limited
- * All rights reserved
- *
- * The license below extends only to copyright in the software and shall
- * not be construed as granting a license to any other intellectual
- * property including but not limited to intellectual property relating
- * to a hardware implementation of the functionality of the software
- * licensed hereunder.  You may use the software subject to the license
- * terms below provided that you ensure that this notice is replicated
- * unmodified and in its entirety in all distributions of the software,
- * modified or unmodified, in source code or in binary form.
- *
- * Copyright (c) 2008 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Gabe Black
- */
-
-#include "dev/x86/intdev.hh"
-
-void
-X86ISA::IntDevice::init()
-{
-    if (!intMasterPort.isConnected()) {
-        panic("Int port not connected to anything!");
-    }
-}
diff --git a/src/dev/x86/intdev.hh b/src/dev/x86/intdev.hh
index 348ec57b8..274873370 100644
--- a/src/dev/x86/intdev.hh
+++ b/src/dev/x86/intdev.hh
@@ -48,7 +48,6 @@
 #include <string>
 
 #include "arch/x86/intmessage.hh"
-#include "arch/x86/x86_traits.hh"
 #include "mem/tport.hh"
 #include "sim/sim_object.hh"
 
@@ -131,30 +130,6 @@ class IntMasterPort : public QueuedMasterPort
     }
 };
 
-class IntDevice
-{
-  protected:
-
-    IntMasterPort<IntDevice> intMasterPort;
-
-  public:
-    IntDevice(SimObject * parent, Tick latency = 0) :
-        intMasterPort(parent->name() + ".int_master", parent, this, latency)
-    {
-    }
-
-    virtual ~IntDevice()
-    {}
-
-    virtual void init();
-
-    virtual bool
-    recvResponse(PacketPtr pkt)
-    {
-        panic("recvResponse not implemented.\n");
-    }
-};
-
 } // namespace X86ISA
 
 #endif //__DEV_X86_INTDEV_HH__