Removed some redundant (identical) files.

--HG--
rename : kernel/include/arch/x86_64/debug.h => kernel/include/arch/x86/debug.h
rename : kernel/include/arch/x86_64/pic.h => kernel/include/arch/x86/pic.h

diff --git a/kernel/arch/x86/conio.c b/kernel/arch/x86/conio.c
index bcc6076..087bddd 100644 (file)
--- a/kernel/arch/x86/conio.c
+++ b/kernel/arch/x86/conio.c
@@ -14,8 +14,8 @@
 
 #include <kernel.h>
 #include <string.h>
-#include <conio.h>
 #include <x86.h>
+#include <arch/x86/conio.h>
 
 #define COLS        80                  ///< Number of columns on screen
 #define LINES       25                 ///< Number of lines on screen

diff --git a/kernel/arch/x86/pic.c b/kernel/arch/x86/pic.c
index 701d1eb..a98bb1f 100644 (file)
--- a/kernel/arch/x86/pic.c
+++ b/kernel/arch/x86/pic.c
@@ -13,7 +13,7 @@
  */
 
 #include <kernel.h>
-#include <pic.h>
+#include <arch/x86/pic.h>
 #include <dev/lpc_pic_dev.h>
 
 /// The dual PIC

diff --git a/kernel/arch/x86_32/debug.c b/kernel/arch/x86_32/debug.c
index 5e60179..a41c202 100644 (file)
--- a/kernel/arch/x86_32/debug.c
+++ b/kernel/arch/x86_32/debug.c
@@ -14,7 +14,7 @@
 
 #include <kernel.h>
 #include <stdio.h>
-#include <debug.h>
+#include <arch/x86/debug.h>
 #include <paging_kernel_arch.h>
 
 union lin_addr {

diff --git a/kernel/arch/x86_32/init.c b/kernel/arch/x86_32/init.c
index a4c0346..4a69901 100644 (file)
--- a/kernel/arch/x86_32/init.c
+++ b/kernel/arch/x86_32/init.c
@@ -20,15 +20,15 @@
 #include <init.h>
 #include <irq.h>
 #include <x86.h>
-#include <conio.h>
 #include <serial.h>
 #include <kernel_multiboot.h>
-#include <pic.h>
-#include <arch/x86/apic.h>
 #include <syscall.h>
 #include <getopt/getopt.h>
 #include <exec.h>
 #include <kputchar.h>
+#include <arch/x86/conio.h>
+#include <arch/x86/pic.h>
+#include <arch/x86/apic.h>
 #include <arch/x86/perfmon_intel.h>
 #include <arch/x86/perfmon_amd.h>
 #include <arch/x86/rtc.h>

diff --git a/kernel/arch/x86_32/irq.c b/kernel/arch/x86_32/irq.c
index fc7518b..7d468a4 100644 (file)
--- a/kernel/arch/x86_32/irq.c
+++ b/kernel/arch/x86_32/irq.c
@@ -52,7 +52,7 @@
 #include <x86.h>
 #include <dispatch.h>
 #include <wakeup.h>
-#include <pic.h>
+#include <arch/x86/pic.h>
 #include <arch/x86/apic.h>
 #include <barrelfish_kpi/dispatcher_shared_target.h>
 #include <asmoffsets.h>

diff --git a/kernel/arch/x86_64/debug.c b/kernel/arch/x86_64/debug.c
index 6b7ffcd..d51787a 100644 (file)
--- a/kernel/arch/x86_64/debug.c
+++ b/kernel/arch/x86_64/debug.c
@@ -14,7 +14,7 @@
 
 #include <kernel.h>
 #include <stdio.h>
-#include <debug.h>
+#include <arch/x86/debug.h>
 #include <paging_kernel_arch.h>
 
 union lin_addr {

diff --git a/kernel/arch/x86_64/init.c b/kernel/arch/x86_64/init.c
index 30e6c5b..6cb6fb2 100644 (file)
--- a/kernel/arch/x86_64/init.c
+++ b/kernel/arch/x86_64/init.c
@@ -20,16 +20,16 @@
 #include <init.h>
 #include <irq.h>
 #include <x86.h>
-#include <conio.h>
 #include <serial.h>
 #include <kernel_multiboot.h>
-#include <pic.h>
-#include <arch/x86/apic.h>
-#include <arch/x86/mcheck.h>
 #include <syscall.h>
 #include <getopt/getopt.h>
 #include <exec.h>
 #include <kputchar.h>
+#include <arch/x86/conio.h>
+#include <arch/x86/pic.h>
+#include <arch/x86/apic.h>
+#include <arch/x86/mcheck.h>
 #include <arch/x86/perfmon.h>
 #include <arch/x86/rtc.h>
 #include <target/x86/barrelfish_kpi/coredata_target.h>

diff --git a/kernel/arch/x86_64/irq.c b/kernel/arch/x86_64/irq.c
index 43c2569..3980b69 100644 (file)
--- a/kernel/arch/x86_64/irq.c
+++ b/kernel/arch/x86_64/irq.c
@@ -54,9 +54,9 @@
 #include <x86.h>
 #include <dispatch.h>
 #include <wakeup.h>
-#include <pic.h>
 #include <arch/x86/perfmon.h>
 #include <arch/x86/barrelfish_kpi/perfmon.h>
+#include <arch/x86/pic.h>
 #include <arch/x86/apic.h>
 #include <barrelfish_kpi/dispatcher_shared_target.h>
 #include <asmoffsets.h>

diff --git a/kernel/include/arch/x86_32/debug.h b/kernel/include/arch/x86/debug.h
similarity index 100%
rename from kernel/include/arch/x86_32/debug.h
rename to kernel/include/arch/x86/debug.h

diff --git a/kernel/include/arch/x86/kputchar.h b/kernel/include/arch/x86/kputchar.h
index 78278a1..3b149b3 100644 (file)
--- a/kernel/include/arch/x86/kputchar.h
+++ b/kernel/include/arch/x86/kputchar.h
@@ -15,7 +15,7 @@
 #ifndef KERNEL_ARCH_X86_KPUTCHAR_H
 #define KERNEL_ARCH_X86_KPUTCHAR_H
 
-#include <conio.h>
+#include <arch/x86/conio.h>
 #include <serial.h>
 #include <arch/x86/global.h>
 

diff --git a/kernel/include/arch/x86_64/pic.h b/kernel/include/arch/x86/pic.h
similarity index 100%
rename from kernel/include/arch/x86_64/pic.h
rename to kernel/include/arch/x86/pic.h

diff --git a/kernel/include/arch/x86_64/debug.h b/kernel/include/arch/x86_64/debug.h
deleted file mode 100644 (file)
index fe4173d..0000000
--- a/kernel/include/arch/x86_64/debug.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * \file
- * \brief Kernel debugging functions
- */
-
-/*
- * Copyright (c) 2008, ETH Zurich.
- * All rights reserved.
- *
- * This file is distributed under the terms in the attached LICENSE file.
- * If you do not find this file, copies can be found by writing to:
- * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
- */
-
-#ifndef KERNEL_DEBUG_H
-#define KERNEL_DEBUG_H
-
-void debug_vaddr_identify(lvaddr_t pml4, lvaddr_t vaddr);
-
-#endif //KERNEL_DEBUG_H