From f0ea79c41f6c6b00b976b6fe67ac350a1852022a Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Tue, 18 Feb 2014 05:50:59 -0500 Subject: [PATCH] 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. --- src/dev/SConscript | 9 +++++---- src/dev/baddev.cc | 4 ---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/dev/SConscript b/src/dev/SConscript index 1bcddb6ee..8596c2f74 100644 --- 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 b3a30b7e5..918c754d5 100644 --- a/src/dev/baddev.cc +++ b/src/dev/baddev.cc @@ -32,14 +32,10 @@ * BadDevice implemenation */ -#include #include -#include #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" -- 2.30.2