diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/alpha_console.cc | 18 | ||||
| -rw-r--r-- | dev/console.cc | 6 | ||||
| -rw-r--r-- | dev/disk_image.cc | 7 | ||||
| -rw-r--r-- | dev/etherbus.cc | 6 | ||||
| -rw-r--r-- | dev/etherdump.cc | 2 | ||||
| -rw-r--r-- | dev/etherlink.cc | 8 | ||||
| -rw-r--r-- | dev/ethertap.cc | 9 | ||||
| -rw-r--r-- | dev/simple_disk.cc | 13 |
8 files changed, 36 insertions, 33 deletions
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc index 526ef0b3c..b917d7a96 100644 --- a/dev/alpha_console.cc +++ b/dev/alpha_console.cc @@ -30,22 +30,22 @@ * System Console Definition */ -#include <stddef.h> -#include <stdio.h> - +#include <cstddef> +#include <cstdio> #include <string> -#include "dev/alpha_console.hh" +#include "base/inifile.hh" +#include "base/str.hh" // for to_number() +#include "base/trace.hh" #include "cpu/base_cpu.hh" -#include "dev/console.hh" #include "cpu/exec_context.hh" -#include "mem/functional_mem/memory_control.hh" +#include "dev/alpha_console.hh" +#include "dev/console.hh" #include "dev/simple_disk.hh" #include "dev/tlaser_clock.hh" +#include "mem/functional_mem/memory_control.hh" +#include "sim/builder.hh" #include "sim/system.hh" -#include "base/trace.hh" -#include "base/inifile.hh" -#include "base/str.hh" // for to_number() using namespace std; diff --git a/dev/console.cc b/dev/console.cc index 976118e2f..168907417 100644 --- a/dev/console.cc +++ b/dev/console.cc @@ -43,12 +43,12 @@ #include <string> #include "base/misc.hh" -#include "targetarch/ev5.hh" - -#include "dev/console.hh" #include "base/socket.hh" #include "base/trace.hh" +#include "dev/console.hh" #include "mem/functional_mem/memory_control.hh" +#include "sim/builder.hh" +#include "targetarch/ev5.hh" using namespace std; diff --git a/dev/disk_image.cc b/dev/disk_image.cc index 0a3955ed1..78599f8d7 100644 --- a/dev/disk_image.cc +++ b/dev/disk_image.cc @@ -33,18 +33,19 @@ #include <sys/types.h> #include <sys/uio.h> #include <errno.h> -#include <string.h> #include <unistd.h> #include <cstdio> +#include <cstring> #include <fstream> #include <string> -#include "dev/disk_image.hh" +#include "base/callback.hh" #include "base/misc.hh" #include "base/trace.hh" +#include "dev/disk_image.hh" +#include "sim/builder.hh" #include "sim/sim_exit.hh" -#include "base/callback.hh" using namespace std; diff --git a/dev/etherbus.cc b/dev/etherbus.cc index fa1d84272..3f6036f72 100644 --- a/dev/etherbus.cc +++ b/dev/etherbus.cc @@ -30,17 +30,17 @@ * Device module for modelling an ethernet hub */ +#include <cmath> #include <deque> #include <string> #include <vector> -#include <math.h> - +#include "base/trace.hh" #include "dev/etherbus.hh" #include "dev/etherdump.hh" #include "dev/etherint.hh" #include "dev/etherpkt.hh" -#include "base/trace.hh" +#include "sim/builder.hh" #include "sim/universe.hh" using namespace std; diff --git a/dev/etherdump.cc b/dev/etherdump.cc index dcca0e458..60dc1559d 100644 --- a/dev/etherdump.cc +++ b/dev/etherdump.cc @@ -34,8 +34,8 @@ #include <string> -#include "sim/universe.hh" #include "dev/etherdump.hh" +#include "sim/builder.hh" #include "sim/universe.hh" using std::string; diff --git a/dev/etherlink.cc b/dev/etherlink.cc index 699e9f331..e5665c7b1 100644 --- a/dev/etherlink.cc +++ b/dev/etherlink.cc @@ -30,17 +30,17 @@ * Device module for modelling a fixed bandwidth full duplex ethernet link */ +#include <cmath> #include <deque> #include <string> #include <vector> -#include <math.h> - -#include "dev/etherlink.hh" +#include "base/trace.hh" #include "dev/etherdump.hh" #include "dev/etherint.hh" +#include "dev/etherlink.hh" #include "dev/etherpkt.hh" -#include "base/trace.hh" +#include "sim/builder.hh" #include "sim/universe.hh" using namespace std; diff --git a/dev/ethertap.cc b/dev/ethertap.cc index e12c07c26..b99d46ce5 100644 --- a/dev/ethertap.cc +++ b/dev/ethertap.cc @@ -40,14 +40,15 @@ #include <deque> #include <string> +#include "base/misc.hh" +#include "base/pollevent.hh" +#include "base/socket.hh" +#include "base/trace.hh" #include "dev/etherdump.hh" #include "dev/etherint.hh" #include "dev/etherpkt.hh" #include "dev/ethertap.hh" -#include "base/pollevent.hh" -#include "base/socket.hh" -#include "base/trace.hh" -#include "base/misc.hh" +#include "sim/builder.hh" using namespace std; diff --git a/dev/simple_disk.cc b/dev/simple_disk.cc index d26cf44ea..aa6ff5b38 100644 --- a/dev/simple_disk.cc +++ b/dev/simple_disk.cc @@ -30,19 +30,20 @@ * Simple disk interface for the system console */ -#include <string> - #include <sys/types.h> #include <sys/uio.h> #include <fcntl.h> -#include <string.h> #include <unistd.h> -#include "dev/disk_image.hh" +#include <cstring> +#include <string> + #include "base/misc.hh" -#include "mem/functional_mem/physical_memory.hh" -#include "dev/simple_disk.hh" #include "base/trace.hh" +#include "dev/disk_image.hh" +#include "dev/simple_disk.hh" +#include "mem/functional_mem/physical_memory.hh" +#include "sim/builder.hh" using namespace std; |