summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
Diffstat (limited to 'dev')
-rw-r--r--dev/alpha_console.cc6
-rw-r--r--dev/baddev.cc2
-rw-r--r--dev/ide_ctrl.cc5
-rw-r--r--dev/ide_disk.cc2
-rw-r--r--dev/io_device.hh2
-rw-r--r--dev/ns_gige.cc5
-rw-r--r--dev/pciconfigall.cc2
-rw-r--r--dev/pcidev.cc3
-rw-r--r--dev/simconsole.cc2
-rw-r--r--dev/simple_disk.cc2
-rw-r--r--dev/simple_disk.hh10
-rw-r--r--dev/sinic.cc5
-rw-r--r--dev/tsunami.cc2
-rw-r--r--dev/tsunami_cchip.cc2
-rw-r--r--dev/tsunami_io.cc2
-rw-r--r--dev/tsunami_pchip.cc4
-rw-r--r--dev/uart.cc2
17 files changed, 27 insertions, 31 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 01ce17dd5..d08f7252e 100644
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -37,16 +37,16 @@
#include "base/inifile.hh"
#include "base/str.hh" // for to_number()
#include "base/trace.hh"
-#include "cpu/base_cpu.hh"
+#include "cpu/base.hh"
#include "cpu/exec_context.hh"
#include "dev/alpha_console.hh"
#include "dev/simconsole.hh"
#include "dev/simple_disk.hh"
-#include "dev/tlaser_clock.hh"
#include "mem/bus/bus.hh"
#include "mem/bus/pio_interface.hh"
#include "mem/bus/pio_interface_impl.hh"
-#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional/memory_control.hh"
+#include "mem/functional/physical.hh"
#include "sim/builder.hh"
#include "sim/system.hh"
#include "dev/tsunami_io.hh"
diff --git a/dev/baddev.cc b/dev/baddev.cc
index bb1d289ab..9b75a2a26 100644
--- a/dev/baddev.cc
+++ b/dev/baddev.cc
@@ -41,7 +41,7 @@
#include "mem/bus/bus.hh"
#include "mem/bus/pio_interface.hh"
#include "mem/bus/pio_interface_impl.hh"
-#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional/memory_control.hh"
#include "sim/builder.hh"
#include "sim/system.hh"
diff --git a/dev/ide_ctrl.cc b/dev/ide_ctrl.cc
index 35d9020db..f4b27db3c 100644
--- a/dev/ide_ctrl.cc
+++ b/dev/ide_ctrl.cc
@@ -33,7 +33,6 @@
#include "base/trace.hh"
#include "cpu/intr_control.hh"
-#include "dev/dma.hh"
#include "dev/ide_ctrl.hh"
#include "dev/ide_disk.hh"
#include "dev/pciconfigall.hh"
@@ -43,8 +42,8 @@
#include "mem/bus/dma_interface.hh"
#include "mem/bus/pio_interface.hh"
#include "mem/bus/pio_interface_impl.hh"
-#include "mem/functional_mem/memory_control.hh"
-#include "mem/functional_mem/physical_memory.hh"
+#include "mem/functional/memory_control.hh"
+#include "mem/functional/physical.hh"
#include "sim/builder.hh"
#include "sim/sim_object.hh"
diff --git a/dev/ide_disk.cc b/dev/ide_disk.cc
index 28f7b634a..285b8a84c 100644
--- a/dev/ide_disk.cc
+++ b/dev/ide_disk.cc
@@ -42,7 +42,7 @@
#include "dev/ide_ctrl.hh"
#include "dev/tsunami.hh"
#include "dev/tsunami_pchip.hh"
-#include "mem/functional_mem/physical_memory.hh"
+#include "mem/functional/physical.hh"
#include "mem/bus/bus.hh"
#include "mem/bus/dma_interface.hh"
#include "mem/bus/pio_interface.hh"
diff --git a/dev/io_device.hh b/dev/io_device.hh
index 649706956..8ab88e6ff 100644
--- a/dev/io_device.hh
+++ b/dev/io_device.hh
@@ -29,7 +29,7 @@
#ifndef __DEV_IO_DEVICE_HH__
#define __DEV_IO_DEVICE_HH__
-#include "mem/functional_mem/functional_memory.hh"
+#include "mem/functional/functional.hh"
class BaseInterface;
class Bus;
diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index 637cd7825..d911d86c4 100644
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -36,7 +36,6 @@
#include "base/inet.hh"
#include "cpu/exec_context.hh"
-#include "dev/dma.hh"
#include "dev/etherlink.hh"
#include "dev/ns_gige.hh"
#include "dev/pciconfigall.hh"
@@ -44,8 +43,8 @@
#include "mem/bus/dma_interface.hh"
#include "mem/bus/pio_interface.hh"
#include "mem/bus/pio_interface_impl.hh"
-#include "mem/functional_mem/memory_control.hh"
-#include "mem/functional_mem/physical_memory.hh"
+#include "mem/functional/memory_control.hh"
+#include "mem/functional/physical.hh"
#include "sim/builder.hh"
#include "sim/debug.hh"
#include "sim/host.hh"
diff --git a/dev/pciconfigall.cc b/dev/pciconfigall.cc
index fd0732d50..c7af8b1d1 100644
--- a/dev/pciconfigall.cc
+++ b/dev/pciconfigall.cc
@@ -42,7 +42,7 @@
#include "mem/bus/bus.hh"
#include "mem/bus/pio_interface.hh"
#include "mem/bus/pio_interface_impl.hh"
-#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional/memory_control.hh"
#include "sim/builder.hh"
#include "sim/system.hh"
diff --git a/dev/pcidev.cc b/dev/pcidev.cc
index 850635d49..9d568e6cc 100644
--- a/dev/pcidev.cc
+++ b/dev/pcidev.cc
@@ -39,11 +39,10 @@
#include "base/misc.hh"
#include "base/str.hh" // for to_number
#include "base/trace.hh"
-#include "dev/pciareg.h"
#include "dev/pcidev.hh"
#include "dev/pciconfigall.hh"
#include "mem/bus/bus.hh"
-#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional/memory_control.hh"
#include "sim/builder.hh"
#include "sim/param.hh"
#include "sim/root.hh"
diff --git a/dev/simconsole.cc b/dev/simconsole.cc
index 94fd9ec1f..1d04e1f95 100644
--- a/dev/simconsole.cc
+++ b/dev/simconsole.cc
@@ -49,7 +49,7 @@
#include "dev/platform.hh"
#include "dev/simconsole.hh"
#include "dev/uart.hh"
-#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional/memory_control.hh"
#include "sim/builder.hh"
using namespace std;
diff --git a/dev/simple_disk.cc b/dev/simple_disk.cc
index 19e8683df..a33b4fe1b 100644
--- a/dev/simple_disk.cc
+++ b/dev/simple_disk.cc
@@ -42,7 +42,7 @@
#include "base/trace.hh"
#include "dev/disk_image.hh"
#include "dev/simple_disk.hh"
-#include "mem/functional_mem/physical_memory.hh"
+#include "mem/functional/physical.hh"
#include "sim/builder.hh"
using namespace std;
diff --git a/dev/simple_disk.hh b/dev/simple_disk.hh
index 3031cdb8b..633acba0d 100644
--- a/dev/simple_disk.hh
+++ b/dev/simple_disk.hh
@@ -30,13 +30,14 @@
* Simple disk interface for the system console
*/
-#ifndef __SIMPLE_DISK_HH__
-#define __SIMPLE_DISK_HH__
+#ifndef __DEV_SIMPLE_DISK_HH__
+#define __DEV_SIMPLE_DISK_HH__
-#include "mem/functional_mem/physical_memory.hh"
#include "sim/sim_object.hh"
+#include "targetarch/isa_traits.hh"
class DiskImage;
+class PhysicalMemory;
/*
* Trivial interface to a disk image used by the System Console
@@ -57,4 +58,5 @@ public:
void read(Addr addr, baddr_t block, int count) const;
void write(Addr addr, baddr_t block, int count);
};
-#endif // __SIMPLE_DISK_HH__
+
+#endif // __DEV_SIMPLE_DISK_HH__
diff --git a/dev/sinic.cc b/dev/sinic.cc
index 5125a1d68..e5cd877a0 100644
--- a/dev/sinic.cc
+++ b/dev/sinic.cc
@@ -33,7 +33,6 @@
#include "base/inet.hh"
#include "cpu/exec_context.hh"
#include "cpu/intr_control.hh"
-#include "dev/dma.hh"
#include "dev/etherlink.hh"
#include "dev/sinic.hh"
#include "dev/pciconfigall.hh"
@@ -41,8 +40,8 @@
#include "mem/bus/dma_interface.hh"
#include "mem/bus/pio_interface.hh"
#include "mem/bus/pio_interface_impl.hh"
-#include "mem/functional_mem/memory_control.hh"
-#include "mem/functional_mem/physical_memory.hh"
+#include "mem/functional/memory_control.hh"
+#include "mem/functional/physical.hh"
#include "sim/builder.hh"
#include "sim/debug.hh"
#include "sim/eventq.hh"
diff --git a/dev/tsunami.cc b/dev/tsunami.cc
index 55a2c5ea6..d4398191b 100644
--- a/dev/tsunami.cc
+++ b/dev/tsunami.cc
@@ -32,9 +32,7 @@
#include "cpu/intr_control.hh"
#include "dev/simconsole.hh"
-#include "dev/etherdev.hh"
#include "dev/ide_ctrl.hh"
-#include "dev/tlaser_clock.hh"
#include "dev/tsunami_cchip.hh"
#include "dev/tsunami_pchip.hh"
#include "dev/tsunami_io.hh"
diff --git a/dev/tsunami_cchip.cc b/dev/tsunami_cchip.cc
index a10dba082..139ea578f 100644
--- a/dev/tsunami_cchip.cc
+++ b/dev/tsunami_cchip.cc
@@ -41,7 +41,7 @@
#include "mem/bus/bus.hh"
#include "mem/bus/pio_interface.hh"
#include "mem/bus/pio_interface_impl.hh"
-#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional/memory_control.hh"
#include "cpu/intr_control.hh"
#include "sim/builder.hh"
#include "sim/system.hh"
diff --git a/dev/tsunami_io.cc b/dev/tsunami_io.cc
index 2e12b41ea..2de064728 100644
--- a/dev/tsunami_io.cc
+++ b/dev/tsunami_io.cc
@@ -46,7 +46,7 @@
#include "dev/tsunami_cchip.hh"
#include "dev/tsunamireg.h"
#include "dev/rtcreg.h"
-#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional/memory_control.hh"
using namespace std;
diff --git a/dev/tsunami_pchip.cc b/dev/tsunami_pchip.cc
index f8bec77c0..4f3e2c529 100644
--- a/dev/tsunami_pchip.cc
+++ b/dev/tsunami_pchip.cc
@@ -41,8 +41,8 @@
#include "mem/bus/bus.hh"
#include "mem/bus/pio_interface.hh"
#include "mem/bus/pio_interface_impl.hh"
-#include "mem/functional_mem/memory_control.hh"
-#include "mem/functional_mem/physical_memory.hh"
+#include "mem/functional/memory_control.hh"
+#include "mem/functional/physical.hh"
#include "sim/builder.hh"
#include "sim/system.hh"
diff --git a/dev/uart.cc b/dev/uart.cc
index c04a5d066..9d453af72 100644
--- a/dev/uart.cc
+++ b/dev/uart.cc
@@ -42,7 +42,7 @@
#include "mem/bus/bus.hh"
#include "mem/bus/pio_interface.hh"
#include "mem/bus/pio_interface_impl.hh"
-#include "mem/functional_mem/memory_control.hh"
+#include "mem/functional/memory_control.hh"
#include "sim/builder.hh"
using namespace std;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 23:03:56 +0000