From c112720b0106e5afd4c9210a53fd20e0735aff61 Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Sun, 14 Mar 2010 14:21:02 +0000 Subject: [PATCH] Move the kernel header files into include/kernel to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@689 f158a5a8-5612-0410-a976-696ce0be7e32 --- arch/amd64/console.c | 2 +- arch/amd64/context.c | 2 +- arch/amd64/elfload.c | 2 +- arch/amd64/lib.c | 2 +- arch/amd64/linux_load.c | 2 +- arch/amd64/loadfs.c | 2 +- arch/amd64/openbios.c | 4 ++-- arch/amd64/segment.c | 2 +- arch/amd64/sys_info.c | 2 +- arch/ppc/briq/briq.c | 2 +- arch/ppc/kernel.c | 4 ++-- arch/ppc/mol/mol.c | 2 +- arch/ppc/pearpc/pearpc.c | 2 +- arch/ppc/qemu/kernel.c | 4 ++-- arch/ppc/qemu/qemu.c | 2 +- arch/sparc32/aoutload.c | 2 +- arch/sparc32/console.c | 2 +- arch/sparc32/context.c | 2 +- arch/sparc32/elfload.c | 2 +- arch/sparc32/forthload.c | 2 +- arch/sparc32/linux_load.c | 2 +- arch/sparc32/loadfs.c | 2 +- arch/sparc32/openbios.c | 4 ++-- arch/sparc32/sys_info.c | 2 +- arch/sparc64/aoutload.c | 2 +- arch/sparc64/console.c | 2 +- arch/sparc64/context.c | 2 +- arch/sparc64/elfload.c | 2 +- arch/sparc64/fcodeload.c | 2 +- arch/sparc64/forthload.c | 2 +- arch/sparc64/linux_load.c | 2 +- arch/sparc64/loadfs.c | 2 +- arch/sparc64/sys_info.c | 2 +- arch/unix/unix.c | 4 ++-- arch/x86/console.c | 2 +- arch/x86/context.c | 2 +- arch/x86/elfload.c | 2 +- arch/x86/forthload.c | 2 +- arch/x86/lib.c | 2 +- arch/x86/linux_load.c | 2 +- arch/x86/loadfs.c | 2 +- arch/x86/openbios.c | 4 ++-- arch/x86/segment.c | 2 +- arch/x86/sys_info.c | 2 +- drivers/esp.c | 2 +- drivers/floppy.c | 2 +- drivers/ide.c | 2 +- drivers/obio.c | 2 +- drivers/pc_kbd.c | 2 +- drivers/pc_serial.c | 2 +- drivers/pci.c | 2 +- drivers/sbus.c | 2 +- drivers/vga_vbe.c | 2 +- include/{openbios => kernel}/kernel.h | 2 +- include/{openbios => kernel}/stack.h | 0 include/ofmem.h | 2 +- include/openbios/bindings.h | 4 ++-- kernel/bootstrap.c | 4 ++-- kernel/dict.c | 2 +- kernel/primitives.c | 4 ++-- kernel/stack.c | 2 +- packages/init.c | 2 +- 62 files changed, 70 insertions(+), 70 deletions(-) rename include/{openbios => kernel}/kernel.h (97%) rename include/{openbios => kernel}/stack.h (100%) diff --git a/arch/amd64/console.c b/arch/amd64/console.c index 590c2d3..e9e493e 100644 --- a/arch/amd64/console.c +++ b/arch/amd64/console.c @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios.h" #ifdef CONFIG_DEBUG_CONSOLE diff --git a/arch/amd64/context.c b/arch/amd64/context.c index b83a07a..fb97410 100644 --- a/arch/amd64/context.c +++ b/arch/amd64/context.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "segment.h" #include "context.h" diff --git a/arch/amd64/elfload.c b/arch/amd64/elfload.c index db7da2d..c035846 100644 --- a/arch/amd64/elfload.c +++ b/arch/amd64/elfload.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" diff --git a/arch/amd64/lib.c b/arch/amd64/lib.c index 2e2fc82..b3b2579 100644 --- a/arch/amd64/lib.c +++ b/arch/amd64/lib.c @@ -12,7 +12,7 @@ #include #include "libc/stdlib.h" #include "libc/vsprintf.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" /* Format a string and print it on the screen, just like the libc * function printf. diff --git a/arch/amd64/linux_load.c b/arch/amd64/linux_load.c index d0a506a..c93d359 100644 --- a/arch/amd64/linux_load.c +++ b/arch/amd64/linux_load.c @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" diff --git a/arch/amd64/loadfs.c b/arch/amd64/loadfs.c index 28c4098..ddad2a1 100644 --- a/arch/amd64/loadfs.c +++ b/arch/amd64/loadfs.c @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" diff --git a/arch/amd64/openbios.c b/arch/amd64/openbios.c index 3ae3c35..d14efbc 100644 --- a/arch/amd64/openbios.c +++ b/arch/amd64/openbios.c @@ -10,8 +10,8 @@ #include "openbios/bindings.h" #include "asm/types.h" #include "dict.h" -#include "openbios/kernel.h" -#include "openbios/stack.h" +#include "kernel/kernel.h" +#include "kernel/stack.h" #include "sys_info.h" #include "openbios.h" #include "relocate.h" diff --git a/arch/amd64/segment.c b/arch/amd64/segment.c index fd4c365..42c9e70 100644 --- a/arch/amd64/segment.c +++ b/arch/amd64/segment.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "relocate.h" #include "segment.h" diff --git a/arch/amd64/sys_info.c b/arch/amd64/sys_info.c index bf779c5..acb56b7 100644 --- a/arch/amd64/sys_info.c +++ b/arch/amd64/sys_info.c @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "context.h" diff --git a/arch/ppc/briq/briq.c b/arch/ppc/briq/briq.c index 58f868b..12edf69 100644 --- a/arch/ppc/briq/briq.c +++ b/arch/ppc/briq/briq.c @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" diff --git a/arch/ppc/kernel.c b/arch/ppc/kernel.c index d4dbe82..f466f0b 100644 --- a/arch/ppc/kernel.c +++ b/arch/ppc/kernel.c @@ -20,8 +20,8 @@ #include "openbios/config.h" #include "dict.h" #include "openbios/bindings.h" -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #include "libc/string.h" #include "kernel.h" diff --git a/arch/ppc/mol/mol.c b/arch/ppc/mol/mol.c index 79bd63e..961c5d2 100644 --- a/arch/ppc/mol/mol.c +++ b/arch/ppc/mol/mol.c @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" diff --git a/arch/ppc/pearpc/pearpc.c b/arch/ppc/pearpc/pearpc.c index 660e11d..53a5a08 100644 --- a/arch/ppc/pearpc/pearpc.c +++ b/arch/ppc/pearpc/pearpc.c @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" diff --git a/arch/ppc/qemu/kernel.c b/arch/ppc/qemu/kernel.c index d81c1f4..cb41d7a 100644 --- a/arch/ppc/qemu/kernel.c +++ b/arch/ppc/qemu/kernel.c @@ -21,8 +21,8 @@ #include "openbios/config.h" #include "dict.h" #include "openbios/bindings.h" -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #include "libc/string.h" #include "kernel.h" diff --git a/arch/ppc/qemu/qemu.c b/arch/ppc/qemu/qemu.c index 068f5bb..a80ee93 100644 --- a/arch/ppc/qemu/qemu.c +++ b/arch/ppc/qemu/qemu.c @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/nvram.h" #include "openbios/bindings.h" #include "openbios/drivers.h" diff --git a/arch/sparc32/aoutload.c b/arch/sparc32/aoutload.c index 492cbc9..5a32562 100644 --- a/arch/sparc32/aoutload.c +++ b/arch/sparc32/aoutload.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "a.out.h" #include "sys_info.h" #include "loadfs.h" diff --git a/arch/sparc32/console.c b/arch/sparc32/console.c index 96d1432..c944bd4 100644 --- a/arch/sparc32/console.c +++ b/arch/sparc32/console.c @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "openbios.h" #include "video_subr.h" diff --git a/arch/sparc32/context.c b/arch/sparc32/context.c index 7ca98ec..3a05f13 100644 --- a/arch/sparc32/context.c +++ b/arch/sparc32/context.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "context.h" #include "sys_info.h" #include "boot.h" diff --git a/arch/sparc32/elfload.c b/arch/sparc32/elfload.c index fb0fe0b..319631f 100644 --- a/arch/sparc32/elfload.c +++ b/arch/sparc32/elfload.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" diff --git a/arch/sparc32/forthload.c b/arch/sparc32/forthload.c index f8fc461..0199961 100644 --- a/arch/sparc32/forthload.c +++ b/arch/sparc32/forthload.c @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" diff --git a/arch/sparc32/linux_load.c b/arch/sparc32/linux_load.c index f8299ec..782d2fb 100644 --- a/arch/sparc32/linux_load.c +++ b/arch/sparc32/linux_load.c @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" diff --git a/arch/sparc32/loadfs.c b/arch/sparc32/loadfs.c index 30e6e11..c02874d 100644 --- a/arch/sparc32/loadfs.c +++ b/arch/sparc32/loadfs.c @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" diff --git a/arch/sparc32/openbios.c b/arch/sparc32/openbios.c index 2ee0433..b84b051 100644 --- a/arch/sparc32/openbios.c +++ b/arch/sparc32/openbios.c @@ -11,8 +11,8 @@ #include "openbios/drivers.h" #include "asm/types.h" #include "dict.h" -#include "openbios/kernel.h" -#include "openbios/stack.h" +#include "kernel/kernel.h" +#include "kernel/stack.h" #include "openbios/nvram.h" #include "../../drivers/timer.h" // XXX #include "sys_info.h" diff --git a/arch/sparc32/sys_info.c b/arch/sparc32/sys_info.c index e0095b0..2709bcc 100644 --- a/arch/sparc32/sys_info.c +++ b/arch/sparc32/sys_info.c @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "elf_boot.h" #include "sys_info.h" #include "context.h" diff --git a/arch/sparc64/aoutload.c b/arch/sparc64/aoutload.c index 1437feb..bdb8c79 100644 --- a/arch/sparc64/aoutload.c +++ b/arch/sparc64/aoutload.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "a.out.h" #include "sys_info.h" diff --git a/arch/sparc64/console.c b/arch/sparc64/console.c index 1211c6e..0611ce9 100644 --- a/arch/sparc64/console.c +++ b/arch/sparc64/console.c @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "openbios/fontdata.h" #include "openbios.h" diff --git a/arch/sparc64/context.c b/arch/sparc64/context.c index c3aa58d..28d0494 100644 --- a/arch/sparc64/context.c +++ b/arch/sparc64/context.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "context.h" #include "sys_info.h" #include "boot.h" diff --git a/arch/sparc64/elfload.c b/arch/sparc64/elfload.c index 68fe091..cc82043 100644 --- a/arch/sparc64/elfload.c +++ b/arch/sparc64/elfload.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" diff --git a/arch/sparc64/fcodeload.c b/arch/sparc64/fcodeload.c index 9e242f6..2cbe708 100644 --- a/arch/sparc64/fcodeload.c +++ b/arch/sparc64/fcodeload.c @@ -3,7 +3,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" diff --git a/arch/sparc64/forthload.c b/arch/sparc64/forthload.c index 5cb79f3..f4a5bdb 100644 --- a/arch/sparc64/forthload.c +++ b/arch/sparc64/forthload.c @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" diff --git a/arch/sparc64/linux_load.c b/arch/sparc64/linux_load.c index 28ea614..771e0c4 100644 --- a/arch/sparc64/linux_load.c +++ b/arch/sparc64/linux_load.c @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" diff --git a/arch/sparc64/loadfs.c b/arch/sparc64/loadfs.c index 30e6e11..c02874d 100644 --- a/arch/sparc64/loadfs.c +++ b/arch/sparc64/loadfs.c @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" diff --git a/arch/sparc64/sys_info.c b/arch/sparc64/sys_info.c index 378632e..230c567 100644 --- a/arch/sparc64/sys_info.c +++ b/arch/sparc64/sys_info.c @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "elf_boot.h" #include "sys_info.h" #include "context.h" diff --git a/arch/unix/unix.c b/arch/unix/unix.c index 054e501..786f926 100644 --- a/arch/unix/unix.c +++ b/arch/unix/unix.c @@ -27,9 +27,9 @@ #include "openbios/sysinclude.h" #include "mconfig.h" #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "dict.h" -#include "openbios/stack.h" +#include "kernel/stack.h" #include "arch/unix/plugins.h" #include "openbios/bindings.h" #include "openbios-version.h" diff --git a/arch/x86/console.c b/arch/x86/console.c index ab9684b..1b1abbe 100644 --- a/arch/x86/console.c +++ b/arch/x86/console.c @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios.h" #ifdef CONFIG_DEBUG_CONSOLE diff --git a/arch/x86/context.c b/arch/x86/context.c index 29ab788..4e745ae 100644 --- a/arch/x86/context.c +++ b/arch/x86/context.c @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "segment.h" #include "context.h" #include "sys_info.h" diff --git a/arch/x86/elfload.c b/arch/x86/elfload.c index 2ae5577..383f9c0 100644 --- a/arch/x86/elfload.c +++ b/arch/x86/elfload.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" diff --git a/arch/x86/forthload.c b/arch/x86/forthload.c index 6022cc5..2bb42ee 100644 --- a/arch/x86/forthload.c +++ b/arch/x86/forthload.c @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "loadfs.h" diff --git a/arch/x86/lib.c b/arch/x86/lib.c index 6007bc9..8d374c0 100644 --- a/arch/x86/lib.c +++ b/arch/x86/lib.c @@ -12,7 +12,7 @@ #include #include "libc/stdlib.h" #include "libc/vsprintf.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" /* Format a string and print it on the screen, just like the libc * function printf. diff --git a/arch/x86/linux_load.c b/arch/x86/linux_load.c index a13f5fa..8798d01 100644 --- a/arch/x86/linux_load.c +++ b/arch/x86/linux_load.c @@ -9,7 +9,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "sys_info.h" #include "context.h" diff --git a/arch/x86/loadfs.c b/arch/x86/loadfs.c index 28c4098..ddad2a1 100644 --- a/arch/x86/loadfs.c +++ b/arch/x86/loadfs.c @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" diff --git a/arch/x86/openbios.c b/arch/x86/openbios.c index fb4b689..39fbcf8 100644 --- a/arch/x86/openbios.c +++ b/arch/x86/openbios.c @@ -10,8 +10,8 @@ #include "openbios/bindings.h" #include "asm/types.h" #include "dict.h" -#include "openbios/kernel.h" -#include "openbios/stack.h" +#include "kernel/kernel.h" +#include "kernel/stack.h" #include "openbios/drivers.h" #include "openbios/pci.h" #include "sys_info.h" diff --git a/arch/x86/segment.c b/arch/x86/segment.c index f58d649..fb78d72 100644 --- a/arch/x86/segment.c +++ b/arch/x86/segment.c @@ -4,7 +4,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "relocate.h" #include "segment.h" diff --git a/arch/x86/sys_info.c b/arch/x86/sys_info.c index 3c5fef2..6679f81 100644 --- a/arch/x86/sys_info.c +++ b/arch/x86/sys_info.c @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "sys_info.h" #include "context.h" diff --git a/drivers/esp.c b/drivers/esp.c index ffbc1ff..b4ef12d 100644 --- a/drivers/esp.c +++ b/drivers/esp.c @@ -15,7 +15,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" diff --git a/drivers/floppy.c b/drivers/floppy.c index 0091a13..f1226e1 100644 --- a/drivers/floppy.c +++ b/drivers/floppy.c @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" diff --git a/drivers/ide.c b/drivers/ide.c index 228ff1e..2e30b28 100644 --- a/drivers/ide.c +++ b/drivers/ide.c @@ -15,7 +15,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" diff --git a/drivers/obio.c b/drivers/obio.c index 5e40ae0..63591a5 100644 --- a/drivers/obio.c +++ b/drivers/obio.c @@ -12,7 +12,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" diff --git a/drivers/pc_kbd.c b/drivers/pc_kbd.c index 56d820e..4a099a8 100644 --- a/drivers/pc_kbd.c +++ b/drivers/pc_kbd.c @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" diff --git a/drivers/pc_serial.c b/drivers/pc_serial.c index cb82855..732cd0a 100644 --- a/drivers/pc_serial.c +++ b/drivers/pc_serial.c @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" diff --git a/drivers/pci.c b/drivers/pci.c index 60918b0..17a4097 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/pci.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" diff --git a/drivers/sbus.c b/drivers/sbus.c index 609b47f..684a3f6 100644 --- a/drivers/sbus.c +++ b/drivers/sbus.c @@ -12,7 +12,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" diff --git a/drivers/vga_vbe.c b/drivers/vga_vbe.c index cbfe1b9..a05a1a9 100644 --- a/drivers/vga_vbe.c +++ b/drivers/vga_vbe.c @@ -17,7 +17,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "openbios/bindings.h" #include "openbios/pci.h" #include "openbios/drivers.h" diff --git a/include/openbios/kernel.h b/include/kernel/kernel.h similarity index 97% rename from include/openbios/kernel.h rename to include/kernel/kernel.h index 1a7ce19..6a12da8 100644 --- a/include/openbios/kernel.h +++ b/include/kernel/kernel.h @@ -18,7 +18,7 @@ #ifndef _H_KERNEL #define _H_KERNEL -#include "openbios/stack.h" +#include "kernel/stack.h" #include "asm/io.h" /* Interrupt status */ diff --git a/include/openbios/stack.h b/include/kernel/stack.h similarity index 100% rename from include/openbios/stack.h rename to include/kernel/stack.h diff --git a/include/ofmem.h b/include/ofmem.h index 37f9e3b..314edf9 100644 --- a/include/ofmem.h +++ b/include/ofmem.h @@ -17,7 +17,7 @@ #ifndef _H_OFMEM #define _H_OFMEM -#include "openbios/stack.h" +#include "kernel/stack.h" typedef struct alloc_desc { struct alloc_desc *next; diff --git a/include/openbios/bindings.h b/include/openbios/bindings.h index 606d93a..4c58159 100644 --- a/include/openbios/bindings.h +++ b/include/openbios/bindings.h @@ -17,8 +17,8 @@ #ifndef _H_BINDINGS #define _H_BINDINGS -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #define PUSH3(a,b,c) do { PUSH((a)); PUSH((b)); PUSH((c)); } while(0) #define PUSH2(a,b) do { PUSH((a)); PUSH((b)); } while(0) diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 7a16017..2484d62 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -22,9 +22,9 @@ #endif #include "openbios/config.h" -#include "openbios/stack.h" +#include "kernel/stack.h" #include "openbios/sysinclude.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "dict.h" #include "cross.h" #include "openbios-version.h" diff --git a/kernel/dict.c b/kernel/dict.c index b94fafd..c85074a 100644 --- a/kernel/dict.c +++ b/kernel/dict.c @@ -8,7 +8,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "dict.h" #ifdef BOOTSTRAP #include diff --git a/kernel/primitives.c b/kernel/primitives.c index 836d89b..9d425f0 100644 --- a/kernel/primitives.c +++ b/kernel/primitives.c @@ -8,8 +8,8 @@ #include "openbios/config.h" #include "openbios/sysinclude.h" -#include "openbios/stack.h" -#include "openbios/kernel.h" +#include "kernel/stack.h" +#include "kernel/kernel.h" #include "dict.h" /* diff --git a/kernel/stack.c b/kernel/stack.c index cb45f97..9e7efff 100644 --- a/kernel/stack.c +++ b/kernel/stack.c @@ -8,7 +8,7 @@ #include "openbios/config.h" -#include "openbios/stack.h" +#include "kernel/stack.h" #include "cross.h" #define dstacksize 512 diff --git a/packages/init.c b/packages/init.c index 9ee3cb0..5cf2d49 100644 --- a/packages/init.c +++ b/packages/init.c @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" +#include "kernel/kernel.h" #include "packages.h" void