[OpenBIOS] [commit] r689 - in trunk/openbios-devel: arch/amd64 arch/ppc arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 drivers include include/kernel inc...

repository service svn at openbios.org
Sun Mar 14 15:21:02 CET 2010


Author: mcayland
Date: Sun Mar 14 15:21:02 2010
New Revision: 689
URL: http://tracker.coreboot.org/trac/openbios/changeset/689

Log:
Move the kernel header files into include/kernel to synchronise with the code directory structure.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at siriusit.co.uk>

Added:
   trunk/openbios-devel/include/kernel/
   trunk/openbios-devel/include/kernel/kernel.h   (contents, props changed)
      - copied, changed from r686, trunk/openbios-devel/include/openbios/kernel.h
   trunk/openbios-devel/include/kernel/stack.h   (props changed)
      - copied unchanged from r686, trunk/openbios-devel/include/openbios/stack.h
Deleted:
   trunk/openbios-devel/include/openbios/kernel.h
   trunk/openbios-devel/include/openbios/stack.h
Modified:
   trunk/openbios-devel/arch/amd64/console.c
   trunk/openbios-devel/arch/amd64/context.c
   trunk/openbios-devel/arch/amd64/elfload.c
   trunk/openbios-devel/arch/amd64/lib.c
   trunk/openbios-devel/arch/amd64/linux_load.c
   trunk/openbios-devel/arch/amd64/loadfs.c
   trunk/openbios-devel/arch/amd64/openbios.c
   trunk/openbios-devel/arch/amd64/segment.c
   trunk/openbios-devel/arch/amd64/sys_info.c
   trunk/openbios-devel/arch/ppc/briq/briq.c
   trunk/openbios-devel/arch/ppc/kernel.c
   trunk/openbios-devel/arch/ppc/mol/mol.c
   trunk/openbios-devel/arch/ppc/pearpc/pearpc.c
   trunk/openbios-devel/arch/ppc/qemu/kernel.c
   trunk/openbios-devel/arch/ppc/qemu/qemu.c
   trunk/openbios-devel/arch/sparc32/aoutload.c
   trunk/openbios-devel/arch/sparc32/console.c
   trunk/openbios-devel/arch/sparc32/context.c
   trunk/openbios-devel/arch/sparc32/elfload.c
   trunk/openbios-devel/arch/sparc32/forthload.c
   trunk/openbios-devel/arch/sparc32/linux_load.c
   trunk/openbios-devel/arch/sparc32/loadfs.c
   trunk/openbios-devel/arch/sparc32/openbios.c
   trunk/openbios-devel/arch/sparc32/sys_info.c
   trunk/openbios-devel/arch/sparc64/aoutload.c
   trunk/openbios-devel/arch/sparc64/console.c
   trunk/openbios-devel/arch/sparc64/context.c
   trunk/openbios-devel/arch/sparc64/elfload.c
   trunk/openbios-devel/arch/sparc64/fcodeload.c
   trunk/openbios-devel/arch/sparc64/forthload.c
   trunk/openbios-devel/arch/sparc64/linux_load.c
   trunk/openbios-devel/arch/sparc64/loadfs.c
   trunk/openbios-devel/arch/sparc64/sys_info.c
   trunk/openbios-devel/arch/unix/unix.c
   trunk/openbios-devel/arch/x86/console.c
   trunk/openbios-devel/arch/x86/context.c
   trunk/openbios-devel/arch/x86/elfload.c
   trunk/openbios-devel/arch/x86/forthload.c
   trunk/openbios-devel/arch/x86/lib.c
   trunk/openbios-devel/arch/x86/linux_load.c
   trunk/openbios-devel/arch/x86/loadfs.c
   trunk/openbios-devel/arch/x86/openbios.c
   trunk/openbios-devel/arch/x86/segment.c
   trunk/openbios-devel/arch/x86/sys_info.c
   trunk/openbios-devel/drivers/esp.c
   trunk/openbios-devel/drivers/floppy.c
   trunk/openbios-devel/drivers/ide.c
   trunk/openbios-devel/drivers/obio.c
   trunk/openbios-devel/drivers/pc_kbd.c
   trunk/openbios-devel/drivers/pc_serial.c
   trunk/openbios-devel/drivers/pci.c
   trunk/openbios-devel/drivers/sbus.c
   trunk/openbios-devel/drivers/vga_vbe.c
   trunk/openbios-devel/include/ofmem.h
   trunk/openbios-devel/include/openbios/bindings.h
   trunk/openbios-devel/kernel/bootstrap.c
   trunk/openbios-devel/kernel/dict.c
   trunk/openbios-devel/kernel/primitives.c
   trunk/openbios-devel/kernel/stack.c
   trunk/openbios-devel/packages/init.c

Modified: trunk/openbios-devel/arch/amd64/console.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/console.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/amd64/console.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -6,7 +6,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios.h"
 
 #ifdef CONFIG_DEBUG_CONSOLE

Modified: trunk/openbios-devel/arch/amd64/context.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/context.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/amd64/context.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -4,7 +4,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "segment.h"
 #include "context.h"
 

Modified: trunk/openbios-devel/arch/amd64/elfload.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/elfload.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/amd64/elfload.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/amd64/lib.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/lib.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/amd64/lib.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -12,7 +12,7 @@
 #include <stdarg.h>
 #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.

Modified: trunk/openbios-devel/arch/amd64/linux_load.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/linux_load.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/amd64/linux_load.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/amd64/loadfs.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/loadfs.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/amd64/loadfs.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/diskio.h"
 #include "loadfs.h"
 

Modified: trunk/openbios-devel/arch/amd64/openbios.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/openbios.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/amd64/openbios.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/amd64/segment.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/segment.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/amd64/segment.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/amd64/sys_info.c
==============================================================================
--- trunk/openbios-devel/arch/amd64/sys_info.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/amd64/sys_info.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "sys_info.h"
 #include "context.h"
 

Modified: trunk/openbios-devel/arch/ppc/briq/briq.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/briq/briq.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/ppc/briq/briq.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/ppc/kernel.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/kernel.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/ppc/kernel.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"
 

Modified: trunk/openbios-devel/arch/ppc/mol/mol.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/mol/mol.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/ppc/mol/mol.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/ppc/pearpc/pearpc.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/pearpc/pearpc.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/ppc/pearpc/pearpc.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/kernel.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/ppc/qemu/kernel.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"
 

Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/qemu.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/ppc/qemu/qemu.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc32/aoutload.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/aoutload.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc32/aoutload.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc32/console.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/console.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc32/console.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc32/context.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/context.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc32/context.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc32/elfload.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/elfload.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc32/elfload.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc32/forthload.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/forthload.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc32/forthload.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc32/linux_load.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/linux_load.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc32/linux_load.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc32/loadfs.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/loadfs.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc32/loadfs.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/diskio.h"
 #include "loadfs.h"
 

Modified: trunk/openbios-devel/arch/sparc32/openbios.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/openbios.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc32/openbios.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc32/sys_info.c
==============================================================================
--- trunk/openbios-devel/arch/sparc32/sys_info.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc32/sys_info.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc64/aoutload.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/aoutload.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc64/aoutload.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc64/console.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/console.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc64/console.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc64/context.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/context.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc64/context.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc64/elfload.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/elfload.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc64/elfload.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/fcodeload.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc64/fcodeload.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc64/forthload.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/forthload.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc64/forthload.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc64/linux_load.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/linux_load.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc64/linux_load.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/sparc64/loadfs.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/loadfs.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc64/loadfs.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/diskio.h"
 #include "loadfs.h"
 

Modified: trunk/openbios-devel/arch/sparc64/sys_info.c
==============================================================================
--- trunk/openbios-devel/arch/sparc64/sys_info.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/sparc64/sys_info.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/unix/unix.c
==============================================================================
--- trunk/openbios-devel/arch/unix/unix.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/unix/unix.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/x86/console.c
==============================================================================
--- trunk/openbios-devel/arch/x86/console.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/x86/console.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -6,7 +6,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "openbios.h"
 
 #ifdef CONFIG_DEBUG_CONSOLE

Modified: trunk/openbios-devel/arch/x86/context.c
==============================================================================
--- trunk/openbios-devel/arch/x86/context.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/x86/context.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/x86/elfload.c
==============================================================================
--- trunk/openbios-devel/arch/x86/elfload.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/x86/elfload.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/x86/forthload.c
==============================================================================
--- trunk/openbios-devel/arch/x86/forthload.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/x86/forthload.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/x86/lib.c
==============================================================================
--- trunk/openbios-devel/arch/x86/lib.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/x86/lib.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -12,7 +12,7 @@
 #include <stdarg.h>
 #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.

Modified: trunk/openbios-devel/arch/x86/linux_load.c
==============================================================================
--- trunk/openbios-devel/arch/x86/linux_load.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/x86/linux_load.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/x86/loadfs.c
==============================================================================
--- trunk/openbios-devel/arch/x86/loadfs.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/x86/loadfs.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "libc/diskio.h"
 #include "loadfs.h"
 

Modified: trunk/openbios-devel/arch/x86/openbios.c
==============================================================================
--- trunk/openbios-devel/arch/x86/openbios.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/x86/openbios.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/x86/segment.c
==============================================================================
--- trunk/openbios-devel/arch/x86/segment.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/x86/segment.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/arch/x86/sys_info.c
==============================================================================
--- trunk/openbios-devel/arch/x86/sys_info.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/arch/x86/sys_info.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "sys_info.h"
 #include "context.h"
 

Modified: trunk/openbios-devel/drivers/esp.c
==============================================================================
--- trunk/openbios-devel/drivers/esp.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/drivers/esp.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"
 

Modified: trunk/openbios-devel/drivers/floppy.c
==============================================================================
--- trunk/openbios-devel/drivers/floppy.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/drivers/floppy.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"
 

Modified: trunk/openbios-devel/drivers/ide.c
==============================================================================
--- trunk/openbios-devel/drivers/ide.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/drivers/ide.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"
 

Modified: trunk/openbios-devel/drivers/obio.c
==============================================================================
--- trunk/openbios-devel/drivers/obio.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/drivers/obio.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"
 

Modified: trunk/openbios-devel/drivers/pc_kbd.c
==============================================================================
--- trunk/openbios-devel/drivers/pc_kbd.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/drivers/pc_kbd.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"
 

Modified: trunk/openbios-devel/drivers/pc_serial.c
==============================================================================
--- trunk/openbios-devel/drivers/pc_serial.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/drivers/pc_serial.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"
 

Modified: trunk/openbios-devel/drivers/pci.c
==============================================================================
--- trunk/openbios-devel/drivers/pci.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/drivers/pci.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/drivers/sbus.c
==============================================================================
--- trunk/openbios-devel/drivers/sbus.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/drivers/sbus.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/drivers/vga_vbe.c
==============================================================================
--- trunk/openbios-devel/drivers/vga_vbe.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/drivers/vga_vbe.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Copied and modified: trunk/openbios-devel/include/kernel/kernel.h (from r686, trunk/openbios-devel/include/openbios/kernel.h)
==============================================================================
--- trunk/openbios-devel/include/openbios/kernel.h	Sat Mar 13 13:44:22 2010	(r686, copy source)
+++ trunk/openbios-devel/include/kernel/kernel.h	Sun Mar 14 15:21:02 2010	(r689)
@@ -18,7 +18,7 @@
 #ifndef _H_KERNEL
 #define _H_KERNEL
 
-#include "openbios/stack.h"
+#include "kernel/stack.h"
 #include "asm/io.h"
 
 /* Interrupt status */

Copied: trunk/openbios-devel/include/kernel/stack.h (from r686, trunk/openbios-devel/include/openbios/stack.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/openbios-devel/include/kernel/stack.h	Sun Mar 14 15:21:02 2010	(r689, copy of r686, trunk/openbios-devel/include/openbios/stack.h)
@@ -0,0 +1,104 @@
+/* stack.h
+ * tag: stack and stack access functions
+ *
+ * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer
+ *
+ * See the file "COPYING" for further information about
+ * the copyright and warranty status of this work.
+ */
+
+#ifndef __STACK_H
+#define __STACK_H
+
+#define dstacksize 512
+extern int  dstackcnt;
+extern cell dstack[dstacksize];
+
+#define rstacksize 512
+extern int  rstackcnt;
+extern cell rstack[rstacksize];
+
+extern int dbgrstackcnt;
+
+//typedef struct opaque_xt *xt_t;
+//typedef struct opaque_ihandle *ihandle_t;
+//typedef struct opaque_phandle *phandle_t;
+
+typedef ucell xt_t;
+typedef ucell ihandle_t;
+typedef ucell phandle_t;
+
+
+
+
+static inline void PUSH(ucell value) {
+	dstack[++dstackcnt] = (value);
+}
+static inline void PUSH_xt( xt_t xt ) { PUSH( (ucell)xt ); }
+static inline void PUSH_ih( ihandle_t ih ) { PUSH( (ucell)ih ); }
+static inline void PUSH_ph( phandle_t ph ) { PUSH( (ucell)ph ); }
+
+static inline ucell POP(void) {
+	return (ucell) dstack[dstackcnt--];
+}
+static inline xt_t POP_xt( void ) { return (xt_t)POP(); }
+static inline ihandle_t POP_ih( void ) { return (ihandle_t)POP(); }
+static inline phandle_t POP_ph( void ) { return (phandle_t)POP(); }
+
+static inline void DROP(void) {
+	dstackcnt--;
+}
+
+static inline void DDROP(void) {
+	dstackcnt -= 2;
+}
+
+static inline void DPUSH(ducell value) {
+#ifdef NEED_FAKE_INT128_T
+	dstack[++dstackcnt] = (cell) value.lo;
+	dstack[++dstackcnt] = (cell) value.hi;
+#else
+	dstack[++dstackcnt] = (cell) value;
+	dstack[++dstackcnt] = (cell) (value >> bitspercell);
+#endif
+}
+
+static inline ducell DPOP(void) {
+#ifdef NEED_FAKE_INT128_T
+	ducell du;
+	du.hi = (ucell) dstack[dstackcnt--];
+	du.lo = (ucell) dstack[dstackcnt--];
+	return du;
+#else
+	ducell du;
+        du = ((ducell)(ucell) dstack[dstackcnt--]) << bitspercell;
+	du |= (ucell) dstack[dstackcnt--];
+	return du;
+#endif
+}
+
+static inline ucell GETTOS(void) {
+	return dstack[dstackcnt];
+}
+
+#define GETITEM(number) (dstack[dstackcnt - number])
+static inline void PUSHR(ucell value) {
+	rstack[++rstackcnt] = (value);
+}
+
+static inline ucell POPR(void) {
+	return (ucell) rstack[rstackcnt--];
+}
+static inline ucell GETTORS(void) {
+	return rstack[rstackcnt];
+}
+
+
+#if defined(DEBUG_DSTACK) || defined(FCOMPILER)
+void printdstack(void);
+#endif
+#if defined(DEBUG_RSTACK) || defined(FCOMPILER)
+void printrstack(void);
+#endif
+
+#endif

Modified: trunk/openbios-devel/include/ofmem.h
==============================================================================
--- trunk/openbios-devel/include/ofmem.h	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/include/ofmem.h	Sun Mar 14 15:21:02 2010	(r689)
@@ -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;

Modified: trunk/openbios-devel/include/openbios/bindings.h
==============================================================================
--- trunk/openbios-devel/include/openbios/bindings.h	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/include/openbios/bindings.h	Sun Mar 14 15:21:02 2010	(r689)
@@ -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)

Modified: trunk/openbios-devel/kernel/bootstrap.c
==============================================================================
--- trunk/openbios-devel/kernel/bootstrap.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/kernel/bootstrap.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"

Modified: trunk/openbios-devel/kernel/dict.c
==============================================================================
--- trunk/openbios-devel/kernel/dict.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/kernel/dict.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -8,7 +8,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "dict.h"
 #ifdef BOOTSTRAP
 #include <string.h>

Modified: trunk/openbios-devel/kernel/primitives.c
==============================================================================
--- trunk/openbios-devel/kernel/primitives.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/kernel/primitives.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -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"
 
 /*

Modified: trunk/openbios-devel/kernel/stack.c
==============================================================================
--- trunk/openbios-devel/kernel/stack.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/kernel/stack.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -8,7 +8,7 @@
 
 
 #include "openbios/config.h"
-#include "openbios/stack.h"
+#include "kernel/stack.h"
 #include "cross.h"
 
 #define dstacksize 512

Modified: trunk/openbios-devel/packages/init.c
==============================================================================
--- trunk/openbios-devel/packages/init.c	Sun Mar 14 14:54:45 2010	(r688)
+++ trunk/openbios-devel/packages/init.c	Sun Mar 14 15:21:02 2010	(r689)
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/kernel.h"
+#include "kernel/kernel.h"
 #include "packages.h"
 
 void



More information about the OpenBIOS mailing list