dev: Include basic devices in NULL ISA build

This patch enbles use of the basic PIO devices as part of the NULL
build. Although it might seem counter intuitive to have a PIO device
without being able to execute a driver, this change enables us to
break a device class hierarchy into an ISA-agnostic part, and an
ISA-specific part, without requiring multiple-inheritance. The
ISA-agnostic base class is a PIO device, but does not make use of the
port.

diff --git a/src/dev/SConscript b/src/dev/SConscript
index 1bcddb6eef87ca622dae161f3b318c7d86be057f..8596c2f7420a2839f8ecdae9bcede3e7c67c6444 100644 (file)
--- a/src/dev/SConscript
+++ b/src/dev/SConscript
@@ -31,12 +31,16 @@
 
 Import('*')
 
+SimObject('Device.py')
+Source('io_device.cc')
+Source('isa_fake.cc')
+DebugFlag('IsaFake')
+
 if env['TARGET_ISA'] == 'null':
     Return()
 
 SimObject('BadDevice.py')
 SimObject('CopyEngine.py')
-SimObject('Device.py')
 SimObject('DiskImage.py')
 SimObject('Ethernet.py')
 SimObject('Ide.py')
@@ -61,8 +65,6 @@ Source('i8254xGBe.cc')
 Source('ide_ctrl.cc')
 Source('ide_disk.cc')
 Source('intel_8254_timer.cc')
-Source('io_device.cc')
-Source('isa_fake.cc')
 Source('mc146818.cc')
 Source('ns_gige.cc')
 Source('pciconfigall.cc')
@@ -92,7 +94,6 @@ DebugFlag('EthernetSM')
 DebugFlag('IdeCtrl')
 DebugFlag('IdeDisk')
 DebugFlag('Intel8254Timer')
-DebugFlag('IsaFake')
 DebugFlag('MC146818')
 DebugFlag('PCIDEV')
 DebugFlag('PciConfigAll')

diff --git a/src/dev/baddev.cc b/src/dev/baddev.cc
index b3a30b7e5747a42b545c2a44fa5ee228980c8a88..918c754d5e58f93d44b493266672238f8170d456 100644 (file)
--- a/src/dev/baddev.cc
+++ b/src/dev/baddev.cc
@@ -32,14 +32,10 @@
  * BadDevice implemenation
  */
 
-#include <deque>
 #include <string>
-#include <vector>
 
 #include "base/trace.hh"
-#include "config/the_isa.hh"
 #include "dev/baddev.hh"
-#include "mem/port.hh"
 #include "params/BadDevice.hh"
 #include "sim/system.hh"