From dd14c86ec8afb3a98d55a58eaafd8b85dd651bd6 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 6 Nov 2006 19:45:00 -0500 Subject: [PATCH] Moved the tsunami devices into the dev/alpha directory. Other devices "generic" devices are dependent on some of those files. That will either need to change, or most likely those devices will have to be considered architecture dependent. --HG-- rename : src/dev/tsunami.cc => src/dev/alpha/tsunami.cc rename : src/dev/tsunami.hh => src/dev/alpha/tsunami.hh rename : src/dev/tsunami_cchip.cc => src/dev/alpha/tsunami_cchip.cc rename : src/dev/tsunami_cchip.hh => src/dev/alpha/tsunami_cchip.hh rename : src/dev/tsunami_io.cc => src/dev/alpha/tsunami_io.cc rename : src/dev/tsunami_io.hh => src/dev/alpha/tsunami_io.hh rename : src/dev/tsunami_pchip.cc => src/dev/alpha/tsunami_pchip.cc rename : src/dev/tsunami_pchip.hh => src/dev/alpha/tsunami_pchip.hh rename : src/dev/tsunamireg.h => src/dev/alpha/tsunamireg.h extra : convert_revision : ffbb6fd93341d2623a6932bf096019b8976da694 --- src/dev/SConscript | 5 --- src/dev/alpha/SConscript | 50 ++++++++++++++-------------- src/dev/{ => alpha}/tsunami.cc | 8 ++--- src/dev/{ => alpha}/tsunami.hh | 0 src/dev/{ => alpha}/tsunami_cchip.cc | 6 ++-- src/dev/{ => alpha}/tsunami_cchip.hh | 2 +- src/dev/{ => alpha}/tsunami_io.cc | 8 ++--- src/dev/{ => alpha}/tsunami_io.hh | 2 +- src/dev/{ => alpha}/tsunami_pchip.cc | 6 ++-- src/dev/{ => alpha}/tsunami_pchip.hh | 2 +- src/dev/{ => alpha}/tsunamireg.h | 0 src/dev/ide_disk.cc | 4 +-- src/dev/isa_fake.hh | 2 +- src/dev/pcidev.cc | 2 +- src/dev/uart8250.hh | 2 +- 15 files changed, 47 insertions(+), 52 deletions(-) rename src/dev/{ => alpha}/tsunami.cc (95%) rename src/dev/{ => alpha}/tsunami.hh (100%) rename src/dev/{ => alpha}/tsunami_cchip.cc (99%) rename src/dev/{ => alpha}/tsunami_cchip.hh (99%) rename src/dev/{ => alpha}/tsunami_io.cc (99%) rename src/dev/{ => alpha}/tsunami_io.hh (99%) rename src/dev/{ => alpha}/tsunami_pchip.cc (99%) rename src/dev/{ => alpha}/tsunami_pchip.hh (99%) rename src/dev/{ => alpha}/tsunamireg.h (100%) diff --git a/src/dev/SConscript b/src/dev/SConscript index 2b8ef28f5..75fca324a 100644 --- a/src/dev/SConscript +++ b/src/dev/SConscript @@ -68,11 +68,6 @@ sources += Split(''' platform.cc simconsole.cc simple_disk.cc - tsunami.cc - tsunami_cchip.cc - tsunami_io.cc - tsunami_fake.cc - tsunami_pchip.cc ''') # Let the target architecture define what additional sources it needs diff --git a/src/dev/alpha/SConscript b/src/dev/alpha/SConscript index b4b879385..304cd9ca9 100644 --- a/src/dev/alpha/SConscript +++ b/src/dev/alpha/SConscript @@ -36,32 +36,32 @@ Import('env') sources = Split(''' console.cc + tsunami.cc + tsunami_cchip.cc + tsunami_io.cc + tsunami_fake.cc + tsunami_pchip.cc ''') -# dev/baddev.cc -# dev/disk_image.cc -# dev/etherbus.cc -# dev/etherdump.cc -# dev/etherint.cc -# dev/etherlink.cc -# dev/etherpkt.cc -# dev/ethertap.cc -# dev/ide_ctrl.cc -# dev/ide_disk.cc -# dev/io_device.cc -# dev/isa_fake.cc -# dev/ns_gige.cc -# dev/pciconfigall.cc -# dev/pcidev.cc -# dev/pcifake.cc -# dev/pktfifo.cc -# dev/platform.cc -# dev/simconsole.cc -# dev/simple_disk.cc -# dev/tsunami.cc -# dev/tsunami_cchip.cc -# dev/tsunami_io.cc -# dev/tsunami_fake.cc -# dev/tsunami_pchip.cc +# baddev.cc +# disk_image.cc +# etherbus.cc +# etherdump.cc +# etherint.cc +# etherlink.cc +# etherpkt.cc +# ethertap.cc +# ide_ctrl.cc +# ide_disk.cc +# io_device.cc +# isa_fake.cc +# ns_gige.cc +# pciconfigall.cc +# pcidev.cc +# pcifake.cc +# pktfifo.cc +# platform.cc +# simconsole.cc +# simple_disk.cc # Convert file names to SCons File objects. This takes care of the # path relative to the top of the directory tree. diff --git a/src/dev/tsunami.cc b/src/dev/alpha/tsunami.cc similarity index 95% rename from src/dev/tsunami.cc rename to src/dev/alpha/tsunami.cc index 8e740a72f..608e88846 100644 --- a/src/dev/tsunami.cc +++ b/src/dev/alpha/tsunami.cc @@ -38,10 +38,10 @@ #include "cpu/intr_control.hh" #include "dev/simconsole.hh" -#include "dev/tsunami_cchip.hh" -#include "dev/tsunami_pchip.hh" -#include "dev/tsunami_io.hh" -#include "dev/tsunami.hh" +#include "dev/alpha/tsunami_cchip.hh" +#include "dev/alpha/tsunami_pchip.hh" +#include "dev/alpha/tsunami_io.hh" +#include "dev/alpha/tsunami.hh" #include "sim/builder.hh" #include "sim/system.hh" diff --git a/src/dev/tsunami.hh b/src/dev/alpha/tsunami.hh similarity index 100% rename from src/dev/tsunami.hh rename to src/dev/alpha/tsunami.hh diff --git a/src/dev/tsunami_cchip.cc b/src/dev/alpha/tsunami_cchip.cc similarity index 99% rename from src/dev/tsunami_cchip.cc rename to src/dev/alpha/tsunami_cchip.cc index 74a68566c..924e1d462 100644 --- a/src/dev/tsunami_cchip.cc +++ b/src/dev/alpha/tsunami_cchip.cc @@ -41,9 +41,9 @@ #include "base/trace.hh" #include "cpu/intr_control.hh" #include "cpu/thread_context.hh" -#include "dev/tsunami.hh" -#include "dev/tsunami_cchip.hh" -#include "dev/tsunamireg.h" +#include "dev/alpha/tsunami.hh" +#include "dev/alpha/tsunami_cchip.hh" +#include "dev/alpha/tsunamireg.h" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "mem/port.hh" diff --git a/src/dev/tsunami_cchip.hh b/src/dev/alpha/tsunami_cchip.hh similarity index 99% rename from src/dev/tsunami_cchip.hh rename to src/dev/alpha/tsunami_cchip.hh index 297a94129..004c3cd29 100644 --- a/src/dev/tsunami_cchip.hh +++ b/src/dev/alpha/tsunami_cchip.hh @@ -35,7 +35,7 @@ #ifndef __TSUNAMI_CCHIP_HH__ #define __TSUNAMI_CCHIP_HH__ -#include "dev/tsunami.hh" +#include "dev/alpha/tsunami.hh" #include "base/range.hh" #include "dev/io_device.hh" diff --git a/src/dev/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc similarity index 99% rename from src/dev/tsunami_io.cc rename to src/dev/alpha/tsunami_io.cc index 73af6c2ef..def214a95 100644 --- a/src/dev/tsunami_io.cc +++ b/src/dev/alpha/tsunami_io.cc @@ -43,10 +43,10 @@ #include "base/trace.hh" #include "dev/pitreg.h" #include "dev/rtcreg.h" -#include "dev/tsunami_cchip.hh" -#include "dev/tsunami.hh" -#include "dev/tsunami_io.hh" -#include "dev/tsunamireg.h" +#include "dev/alpha/tsunami_cchip.hh" +#include "dev/alpha/tsunami.hh" +#include "dev/alpha/tsunami_io.hh" +#include "dev/alpha/tsunamireg.h" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "mem/port.hh" diff --git a/src/dev/tsunami_io.hh b/src/dev/alpha/tsunami_io.hh similarity index 99% rename from src/dev/tsunami_io.hh rename to src/dev/alpha/tsunami_io.hh index 5ea3628c1..54acefc25 100644 --- a/src/dev/tsunami_io.hh +++ b/src/dev/alpha/tsunami_io.hh @@ -39,7 +39,7 @@ #include "dev/io_device.hh" #include "base/range.hh" -#include "dev/tsunami.hh" +#include "dev/alpha/tsunami.hh" #include "sim/eventq.hh" /** diff --git a/src/dev/tsunami_pchip.cc b/src/dev/alpha/tsunami_pchip.cc similarity index 99% rename from src/dev/tsunami_pchip.cc rename to src/dev/alpha/tsunami_pchip.cc index 549db1a50..94a7f96e5 100644 --- a/src/dev/tsunami_pchip.cc +++ b/src/dev/alpha/tsunami_pchip.cc @@ -38,9 +38,9 @@ #include #include "base/trace.hh" -#include "dev/tsunami_pchip.hh" -#include "dev/tsunamireg.h" -#include "dev/tsunami.hh" +#include "dev/alpha/tsunami_pchip.hh" +#include "dev/alpha/tsunamireg.h" +#include "dev/alpha/tsunami.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "sim/builder.hh" diff --git a/src/dev/tsunami_pchip.hh b/src/dev/alpha/tsunami_pchip.hh similarity index 99% rename from src/dev/tsunami_pchip.hh rename to src/dev/alpha/tsunami_pchip.hh index d0a9c3157..1632a36d4 100644 --- a/src/dev/tsunami_pchip.hh +++ b/src/dev/alpha/tsunami_pchip.hh @@ -35,7 +35,7 @@ #ifndef __TSUNAMI_PCHIP_HH__ #define __TSUNAMI_PCHIP_HH__ -#include "dev/tsunami.hh" +#include "dev/alpha/tsunami.hh" #include "base/range.hh" #include "dev/io_device.hh" diff --git a/src/dev/tsunamireg.h b/src/dev/alpha/tsunamireg.h similarity index 100% rename from src/dev/tsunamireg.h rename to src/dev/alpha/tsunamireg.h diff --git a/src/dev/ide_disk.cc b/src/dev/ide_disk.cc index 5d3346b1e..5083c9c8d 100644 --- a/src/dev/ide_disk.cc +++ b/src/dev/ide_disk.cc @@ -44,8 +44,8 @@ #include "dev/disk_image.hh" #include "dev/ide_disk.hh" #include "dev/ide_ctrl.hh" -#include "dev/tsunami.hh" -#include "dev/tsunami_pchip.hh" +#include "dev/alpha/tsunami.hh" +#include "dev/alpha/tsunami_pchip.hh" #include "sim/builder.hh" #include "sim/sim_object.hh" #include "sim/root.hh" diff --git a/src/dev/isa_fake.hh b/src/dev/isa_fake.hh index 6665f1a78..c781d1ba6 100644 --- a/src/dev/isa_fake.hh +++ b/src/dev/isa_fake.hh @@ -38,7 +38,7 @@ #include "base/range.hh" #include "dev/io_device.hh" -#include "dev/tsunami.hh" +#include "dev/alpha/tsunami.hh" #include "mem/packet.hh" /** diff --git a/src/dev/pcidev.cc b/src/dev/pcidev.cc index 8c0d03817..383fc494f 100644 --- a/src/dev/pcidev.cc +++ b/src/dev/pcidev.cc @@ -45,7 +45,7 @@ #include "base/trace.hh" #include "dev/pciconfigall.hh" #include "dev/pcidev.hh" -#include "dev/tsunamireg.h" +#include "dev/alpha/tsunamireg.h" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "sim/builder.hh" diff --git a/src/dev/uart8250.hh b/src/dev/uart8250.hh index 2e768216a..a0620c7e0 100644 --- a/src/dev/uart8250.hh +++ b/src/dev/uart8250.hh @@ -35,7 +35,7 @@ #ifndef __DEV_UART8250_HH__ #define __DEV_UART8250_HH__ -#include "dev/tsunamireg.h" +#include "dev/alpha/tsunamireg.h" #include "base/range.hh" #include "dev/io_device.hh" #include "dev/uart.hh"