From 2c71e02ca46a89b723f426834db422b3584c6500 Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Tue, 3 Sep 2013 03:10:41 +0300 Subject: [PATCH] Apply olive oil to the headers. Put mini-os specific stuff under mini-os and toss until things build. --- Makefile | 2 +- arch/x86/x86_32.S | 2 +- arch/x86/x86_64.S | 2 +- include/mini-os/arch_limits.h | 3 +++ include/mini-os/arch_mm.h | 3 +++ include/mini-os/arch_sched.h | 3 +++ include/mini-os/arch_spinlock.h | 3 +++ include/mini-os/gntmap.h | 2 +- include/mini-os/hypervisor.h | 6 ++---- include/mini-os/os.h | 3 +++ include/mini-os/traps.h | 3 +++ include/{ => mini-os}/x86/arch_limits.h | 0 include/{ => mini-os}/x86/arch_mm.h | 0 include/{ => mini-os}/x86/arch_sched.h | 0 include/{ => mini-os}/x86/arch_spinlock.h | 0 include/{ => mini-os}/x86/os.h | 0 include/{ => mini-os}/x86/traps.h | 0 include/{ => mini-os}/x86/x86_32/hypercall-x86_32.h | 0 include/{ => mini-os}/x86/x86_64/hypercall-x86_64.h | 0 19 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 include/mini-os/arch_limits.h create mode 100644 include/mini-os/arch_mm.h create mode 100644 include/mini-os/arch_sched.h create mode 100644 include/mini-os/arch_spinlock.h create mode 100644 include/mini-os/os.h create mode 100644 include/mini-os/traps.h rename include/{ => mini-os}/x86/arch_limits.h (100%) rename include/{ => mini-os}/x86/arch_mm.h (100%) rename include/{ => mini-os}/x86/arch_sched.h (100%) rename include/{ => mini-os}/x86/arch_spinlock.h (100%) rename include/{ => mini-os}/x86/os.h (100%) rename include/{ => mini-os}/x86/traps.h (100%) rename include/{ => mini-os}/x86/x86_32/hypercall-x86_32.h (100%) rename include/{ => mini-os}/x86/x86_64/hypercall-x86_64.h (100%) diff --git a/Makefile b/Makefile index 964ee90..b3fd9af 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ include/mini-os/list.h: $(XEN_ROOT)/tools/include/xen-external/bsd-sys-queue-h-s .PHONY: links links: include/mini-os/list.h $(ARCH_LINKS) [ -e include/xen ] || ln -sf ../../../xen/include/public include/xen - [ -e include/$(TARGET_ARCH_FAM)/mini-os ] || ln -sf . include/$(TARGET_ARCH_FAM)/mini-os + [ -e include/mini-os/machine ] || ln -sf $(TARGET_ARCH_FAM) include/mini-os/machine .PHONY: arch_lib arch_lib: diff --git a/arch/x86/x86_32.S b/arch/x86/x86_32.S index fb3e30a..df6fde6 100644 --- a/arch/x86/x86_32.S +++ b/arch/x86/x86_32.S @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/arch/x86/x86_64.S b/arch/x86/x86_64.S index a65e5d5..53c0496 100644 --- a/arch/x86/x86_64.S +++ b/arch/x86/x86_64.S @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/include/mini-os/arch_limits.h b/include/mini-os/arch_limits.h new file mode 100644 index 0000000..950d211 --- /dev/null +++ b/include/mini-os/arch_limits.h @@ -0,0 +1,3 @@ +/* XXX: only because I'm too lazy to fix the includers now */ + +#include diff --git a/include/mini-os/arch_mm.h b/include/mini-os/arch_mm.h new file mode 100644 index 0000000..d081dd3 --- /dev/null +++ b/include/mini-os/arch_mm.h @@ -0,0 +1,3 @@ +/* XXX: only because I'm too lazy to fix the includers now */ + +#include diff --git a/include/mini-os/arch_sched.h b/include/mini-os/arch_sched.h new file mode 100644 index 0000000..9085dc5 --- /dev/null +++ b/include/mini-os/arch_sched.h @@ -0,0 +1,3 @@ +/* XXX: only because I'm too lazy to fix the includers now */ + +#include diff --git a/include/mini-os/arch_spinlock.h b/include/mini-os/arch_spinlock.h new file mode 100644 index 0000000..a454bcd --- /dev/null +++ b/include/mini-os/arch_spinlock.h @@ -0,0 +1,3 @@ +/* XXX: only because I'm too lazy to fix the includers now */ + +#include diff --git a/include/mini-os/gntmap.h b/include/mini-os/gntmap.h index fde53f3..4df30a0 100644 --- a/include/mini-os/gntmap.h +++ b/include/mini-os/gntmap.h @@ -1,7 +1,7 @@ #ifndef __GNTMAP_H__ #define __GNTMAP_H__ -#include +#include /* * Please consider struct gntmap opaque. If instead you choose to disregard diff --git a/include/mini-os/hypervisor.h b/include/mini-os/hypervisor.h index e299df1..3534421 100644 --- a/include/mini-os/hypervisor.h +++ b/include/mini-os/hypervisor.h @@ -16,11 +16,9 @@ #include #include #if defined(__i386__) -#include +#include #elif defined(__x86_64__) -#include -#elif defined(__ia64__) -#include +#include #else #error "Unsupported architecture" #endif diff --git a/include/mini-os/os.h b/include/mini-os/os.h new file mode 100644 index 0000000..77d3e9c --- /dev/null +++ b/include/mini-os/os.h @@ -0,0 +1,3 @@ +/* XXX: only because I'm too lazy to fix the includers now */ + +#include diff --git a/include/mini-os/traps.h b/include/mini-os/traps.h new file mode 100644 index 0000000..d62990f --- /dev/null +++ b/include/mini-os/traps.h @@ -0,0 +1,3 @@ +/* XXX: only because I'm too lazy to fix the includers now */ + +#include diff --git a/include/x86/arch_limits.h b/include/mini-os/x86/arch_limits.h similarity index 100% rename from include/x86/arch_limits.h rename to include/mini-os/x86/arch_limits.h diff --git a/include/x86/arch_mm.h b/include/mini-os/x86/arch_mm.h similarity index 100% rename from include/x86/arch_mm.h rename to include/mini-os/x86/arch_mm.h diff --git a/include/x86/arch_sched.h b/include/mini-os/x86/arch_sched.h similarity index 100% rename from include/x86/arch_sched.h rename to include/mini-os/x86/arch_sched.h diff --git a/include/x86/arch_spinlock.h b/include/mini-os/x86/arch_spinlock.h similarity index 100% rename from include/x86/arch_spinlock.h rename to include/mini-os/x86/arch_spinlock.h diff --git a/include/x86/os.h b/include/mini-os/x86/os.h similarity index 100% rename from include/x86/os.h rename to include/mini-os/x86/os.h diff --git a/include/x86/traps.h b/include/mini-os/x86/traps.h similarity index 100% rename from include/x86/traps.h rename to include/mini-os/x86/traps.h diff --git a/include/x86/x86_32/hypercall-x86_32.h b/include/mini-os/x86/x86_32/hypercall-x86_32.h similarity index 100% rename from include/x86/x86_32/hypercall-x86_32.h rename to include/mini-os/x86/x86_32/hypercall-x86_32.h diff --git a/include/x86/x86_64/hypercall-x86_64.h b/include/mini-os/x86/x86_64/hypercall-x86_64.h similarity index 100% rename from include/x86/x86_64/hypercall-x86_64.h rename to include/mini-os/x86/x86_64/hypercall-x86_64.h -- 2.39.5