OpenBIOS

Download

openbios@openbios.org

March 2010

11 participants
56 discussions

[commit] r693 - in trunk/openbios-devel: arch/amd64 arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 drivers include include/arch/common include/arch/ppc include/arch/sparc64 include/libopenbios in...
by repository service March 14, 2010

March 14, 2010

Author: mcayland Date: Sun Mar 14 17:09:44 2010 New Revision: 693 URL: http://tracker.coreboot.org/trac/openbios/changeset/693 Log: Fix the sys_info.h header file so it doesn't reference functions both inside and outside of libopenbios, and move the firmware configuration header file to include/arch/common. Following through the code showed that elfnote.c and linuxbios.c were being used by sys_info and so these are also renamed to elf_info.c and linuxbios_info.c for clarity. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/common/ trunk/openbios-devel/include/arch/common/fw_cfg.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/fw_cfg.h trunk/openbios-devel/include/libopenbios/sys_info.h (contents, props changed) - copied, changed from r692, trunk/openbios-devel/include/sys_info.h trunk/openbios-devel/libopenbios/elf_info.c (contents, props changed) - copied, changed from r692, trunk/openbios-devel/libopenbios/elfnote.c trunk/openbios-devel/libopenbios/linuxbios_info.c (contents, props changed) - copied, changed from r692, trunk/openbios-devel/libopenbios/linuxbios.c Deleted: trunk/openbios-devel/include/openbios/fw_cfg.h trunk/openbios-devel/include/sys_info.h trunk/openbios-devel/libopenbios/elfnote.c trunk/openbios-devel/libopenbios/linuxbios.c Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/amd64/builtin.c trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/amd64/linux_load.c trunk/openbios-devel/arch/amd64/multiboot.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/amd64/plainboot.c trunk/openbios-devel/arch/amd64/segment.c trunk/openbios-devel/arch/amd64/sys_info.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/builtin.c trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/entry.S trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc32/multiboot.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/plainboot.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/builtin.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/entry.S trunk/openbios-devel/arch/sparc64/fcodeload.c trunk/openbios-devel/arch/sparc64/forthload.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/multiboot.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/sparc64/plainboot.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/builtin.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/linux_load.c trunk/openbios-devel/arch/x86/multiboot.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/plainboot.c trunk/openbios-devel/arch/x86/segment.c trunk/openbios-devel/arch/x86/sys_info.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/include/arch/ppc/io.h trunk/openbios-devel/include/arch/sparc64/io.h trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ #include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" int elf_load(struct sys_info *, const char *filename, const char *cmdline); int linux_load(struct sys_info *, const char *filename, const char *cmdline); Modified: trunk/openbios-devel/arch/amd64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include <asm/types.h> -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #define printf printk Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "segment.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/amd64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define printf printk Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -12,11 +12,12 @@ #include "dict.h" #include "kernel/kernel.h" #include "kernel/stack.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "relocate.h" void boot(void); +void collect_sys_info(struct sys_info *info); static char intdict[256 * 1024]; Modified: trunk/openbios-devel/arch/amd64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/amd64/segment.c ============================================================================== --- trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 17:09:44 2010 (r693) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/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 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #define printf printk Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 17:09:44 2010 (r693) @@ -31,7 +31,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #include "arch/ppc/processor.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 17:09:44 2010 (r693) @@ -23,7 +23,7 @@ #include "kernel.h" #include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" //#define DEBUG_QEMU Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "a.out.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "drivers/drivers.h" #include "libc/diskio.h" #include "libc/vsprintf.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openprom.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 17:09:44 2010 (r693) @@ -33,6 +33,7 @@ // sys_info.c extern unsigned int qemu_mem_size; +extern void collect_sys_info(struct sys_info *info); // romvec.c extern struct linux_arguments_v0 obp_arg; Modified: trunk/openbios-devel/arch/sparc32/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "asm/types.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "context.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define MAIN_STACK_SIZE 16384 Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/entry.S Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/entry.S Sun Mar 14 17:09:44 2010 (r693) @@ -12,7 +12,7 @@ #include "asm/crs.h" #define NO_QEMU_PROTOS #define NO_OPENBIOS_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #define CFG_ADDR 0x00000510 #define CFG_ASI 0x2d Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printk printk Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 17:09:44 2010 (r693) @@ -13,7 +13,7 @@ #include "asm/asi.h" #include "pgtsrmmu.h" #include "openprom.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define NCTX_SWIFT 0x100 Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -15,7 +15,7 @@ #include "kernel/stack.h" #include "openbios/nvram.h" #include "../../drivers/timer.h" // XXX -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "boot.h" #include "video_subr.h" Modified: trunk/openbios-devel/arch/sparc32/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #ifdef CONFIG_DEBUG_OBP Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,7 +1,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ #include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "a.out.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" struct sys_info sys_info; Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 17:09:44 2010 (r693) @@ -37,6 +37,7 @@ // sys_info.c extern uint64_t qemu_mem_size; +extern void collect_sys_info(struct sys_info *info); // console.c void ob_su_init(uint64_t base, uint64_t offset, int intr); Modified: trunk/openbios-devel/arch/sparc64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "asm/types.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 17:09:44 2010 (r693) @@ -13,7 +13,7 @@ #include "openbios.h" #include "video_subr.h" #include "libc/vsprintf.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" /* ****************************************************************** Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "context.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define MAIN_STACK_SIZE 16384 Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/entry.S Sun Mar 14 17:09:44 2010 (r693) @@ -13,7 +13,7 @@ #include "lsu.h" #define NO_QEMU_PROTOS #define NO_OPENBIOS_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #define PROM_ADDR 0x1fff0000000 #define CFG_ADDR 0x1fe02000510 Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 17:09:44 2010 (r693) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printk printk Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "libc/vsprintf.h" #include "libopenbios/bindings.h" #include "spitfire.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #include "ofmem_sparc64.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,14 +11,14 @@ #include "drivers/drivers.h" #include "dict.h" #include "openbios/nvram.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "drivers/pci.h" #include "asm/pci.h" #include "boot.h" #include "../../drivers/timer.h" // XXX #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #include "video_subr.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/sparc64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,7 +1,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 17:09:44 2010 (r693) @@ -12,7 +12,7 @@ #include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" struct sys_info sys_info; Modified: trunk/openbios-devel/arch/x86/builtin.c ============================================================================== --- trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" /* * wrap an array around the hex'ed dictionary file Modified: trunk/openbios-devel/arch/x86/context.c ============================================================================== --- trunk/openbios-devel/arch/x86/context.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/context.c Sun Mar 14 17:09:44 2010 (r693) @@ -10,7 +10,7 @@ #include "kernel/kernel.h" #include "segment.h" #include "context.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "boot.h" #define MAIN_STACK_SIZE 16384 Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 17:09:44 2010 (r693) @@ -8,7 +8,7 @@ #include "openbios/elf.h" #include "asm/elf.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 17:09:44 2010 (r693) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" #define printk printk Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 17:09:44 2010 (r693) @@ -11,7 +11,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #include "segment.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/x86/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -2,7 +2,7 @@ #include "openbios/config.h" #include "asm/io.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #ifdef CONFIG_DEBUG_BOOT Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 17:09:44 2010 (r693) @@ -14,11 +14,12 @@ #include "kernel/stack.h" #include "drivers/drivers.h" #include "drivers/pci.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "openbios.h" #include "relocate.h" void boot(void); +void collect_sys_info(struct sys_info *info); static unsigned char intdict[256 * 1024]; Modified: trunk/openbios-devel/arch/x86/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 17:09:44 2010 (r693) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "multiboot.h" #define FIXED_DICTSTART 0xfffe0000 Modified: trunk/openbios-devel/arch/x86/segment.c ============================================================================== --- trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 17:09:44 2010 (r693) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/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 16:19:41 2010 (r692) +++ trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "context.h" #ifdef CONFIG_DEBUG_BOOT Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 17:09:44 2010 (r693) @@ -3,7 +3,7 @@ #include "libc/byteorder.h" #include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #if !defined(CONFIG_SPARC64) static volatile uint16_t *fw_cfg_cmd; Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 17:09:44 2010 (r693) @@ -21,7 +21,7 @@ #include "libopenbios/ofmem.h" #include "obio.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" #include "escc.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Copied: trunk/openbios-devel/include/arch/common/fw_cfg.h (from r692, trunk/openbios-devel/include/openbios/fw_cfg.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/fw_cfg.h Sun Mar 14 17:09:44 2010 (r693, copy of r692, trunk/openbios-devel/include/openbios/fw_cfg.h) @@ -0,0 +1,84 @@ +#ifndef FW_CFG_H +#define FW_CFG_H + +#define FW_CFG_SIGNATURE 0x00 +#define FW_CFG_ID 0x01 +#define FW_CFG_UUID 0x02 +#define FW_CFG_RAM_SIZE 0x03 +#define FW_CFG_NOGRAPHIC 0x04 +#define FW_CFG_NB_CPUS 0x05 +#define FW_CFG_MACHINE_ID 0x06 +#define FW_CFG_KERNEL_ADDR 0x07 +#define FW_CFG_KERNEL_SIZE 0x08 +#define FW_CFG_KERNEL_CMDLINE 0x09 +#define FW_CFG_INITRD_ADDR 0x0a +#define FW_CFG_INITRD_SIZE 0x0b +#define FW_CFG_BOOT_DEVICE 0x0c +#define FW_CFG_NUMA 0x0d +#define FW_CFG_BOOT_MENU 0x0e +#define FW_CFG_MAX_CPUS 0x0f +#define FW_CFG_KERNEL_ENTRY 0x10 +#define FW_CFG_KERNEL_DATA 0x11 +#define FW_CFG_INITRD_DATA 0x12 +#define FW_CFG_CMDLINE_ADDR 0x13 +#define FW_CFG_CMDLINE_SIZE 0x14 +#define FW_CFG_CMDLINE_DATA 0x15 +#define FW_CFG_SETUP_ADDR 0x16 +#define FW_CFG_SETUP_SIZE 0x17 +#define FW_CFG_SETUP_DATA 0x18 +#define FW_CFG_FILE_DIR 0x19 + +#define FW_CFG_FILE_FIRST 0x20 +#define FW_CFG_FILE_SLOTS 0x10 +#define FW_CFG_MAX_ENTRY (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) + +#define FW_CFG_WRITE_CHANNEL 0x4000 +#define FW_CFG_ARCH_LOCAL 0x8000 +#define FW_CFG_ENTRY_MASK ~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL) + +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) +#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03) +#define FW_CFG_PPC_CPUFREQ (FW_CFG_ARCH_LOCAL + 0x04) + +#define FW_CFG_INVALID 0xffff + +#ifndef NO_QEMU_PROTOS +typedef struct FWCfgFile { + uint32_t size; /* file size */ + uint16_t select; /* write this to 0x510 to read it */ + uint16_t reserved; + char name[56]; +} FWCfgFile; + +typedef struct FWCfgFiles { + uint32_t count; + FWCfgFile f[]; +} FWCfgFiles; + +typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); + +typedef struct _FWCfgState FWCfgState; +int fw_cfg_add_bytes(FWCfgState *s, uint16_t key, uint8_t *data, uint32_t len); +int fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value); +int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value); +int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value); +int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback, + void *callback_opaque, uint8_t *data, size_t len); +int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename, + uint8_t *data, uint32_t len); +FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, + target_phys_addr_t crl_addr, target_phys_addr_t data_addr); + +#endif /* NO_QEMU_PROTOS */ + +#ifndef NO_OPENBIOS_PROTOS +void fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes); +uint64_t fw_cfg_read_i64(uint16_t cmd); +uint32_t fw_cfg_read_i32(uint16_t cmd); +uint16_t fw_cfg_read_i16(uint16_t cmd); +void fw_cfg_init(void); +#endif /* NO_OPENBIOS_PROTOS */ + +#endif Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/include/arch/ppc/io.h Sun Mar 14 17:09:44 2010 (r693) @@ -4,7 +4,7 @@ #include "asm/types.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" extern unsigned long virt_offset; Modified: trunk/openbios-devel/include/arch/sparc64/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/io.h Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/include/arch/sparc64/io.h Sun Mar 14 17:09:44 2010 (r693) @@ -4,7 +4,7 @@ #include "asm/types.h" #define NO_QEMU_PROTOS -#include "openbios/fw_cfg.h" +#include "arch/common/fw_cfg.h" extern unsigned long va_shift; // Set in entry.S // Defined in ldscript Copied and modified: trunk/openbios-devel/include/libopenbios/sys_info.h (from r692, trunk/openbios-devel/include/sys_info.h) ============================================================================== --- trunk/openbios-devel/include/sys_info.h Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/include/libopenbios/sys_info.h Sun Mar 14 17:09:44 2010 (r693) @@ -22,7 +22,6 @@ unsigned long *dict_end; }; -void collect_sys_info(struct sys_info *info); void collect_elfboot_info(struct sys_info *info); void collect_linuxbios_info(struct sys_info *info); Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sun Mar 14 16:19:41 2010 (r692) +++ trunk/openbios-devel/libopenbios/build.xml Sun Mar 14 17:09:44 2010 (r693) @@ -4,15 +4,15 @@ <object source="bindings.c"/> <object source="client.c"/> <object source="console_common.c"/> - <object source="elfnote.c" condition="X86"/> - <object source="elfnote.c" condition="AMD64"/> - <object source="elfnote.c" condition="SPARC32"/> - <object source="elfnote.c" condition="SPARC64"/> - <object source="elfload.c" condition="PPC"/> + <object source="elf_info.c" condition="X86"/> + <object source="elf_info.c" condition="AMD64"/> + <object source="elf_info.c" condition="SPARC32"/> + <object source="elf_info.c" condition="SPARC64"/> + <object source="elf_info.c" condition="PPC"/> <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> <object source="ipchecksum.c"/> - <object source="linuxbios.c" condition="LINUXBIOS"/> + <object source="linuxbios_info.c" condition="LINUXBIOS"/> <object source="ofmem_common.c" condition="OFMEM"/> </library> Copied and modified: trunk/openbios-devel/libopenbios/elf_info.c (from r692, trunk/openbios-devel/libopenbios/elfnote.c) ============================================================================== --- trunk/openbios-devel/libopenbios/elfnote.c Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -1,7 +1,7 @@ /* Support for ELF Boot Proposal as a boot image */ #include "openbios/config.h" #include "elf_boot.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #include "asm/io.h" #include "libopenbios/ipchecksum.h" #include "openbios-version.h" Copied and modified: trunk/openbios-devel/libopenbios/linuxbios_info.c (from r692, trunk/openbios-devel/libopenbios/linuxbios.c) ============================================================================== --- trunk/openbios-devel/libopenbios/linuxbios.c Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/libopenbios/linuxbios_info.c Sun Mar 14 17:09:44 2010 (r693) @@ -6,7 +6,7 @@ #include "asm/io.h" #include "linuxbios.h" #include "libopenbios/ipchecksum.h" -#include "sys_info.h" +#include "libopenbios/sys_info.h" #ifdef CONFIG_DEBUG_BOOT #define debug printk

3 2

[commit] r696 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 drivers include libopenbios packages
by repository service March 14, 2010

March 14, 2010

Author: mcayland Date: Sun Mar 14 21:10:01 2010 New Revision: 696 URL: http://tracker.coreboot.org/trac/openbios/changeset/696 Log: Split video_subr.h into its separate components so that they can live in the right places, rather than placing the definitions from lots of different C files into a single header. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Deleted: trunk/openbios-devel/include/video_subr.h Modified: trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/vga.h trunk/openbios-devel/drivers/vga_load_regs.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc32/boot.h Sun Mar 14 21:10:01 2010 (r696) @@ -35,6 +35,9 @@ extern unsigned int qemu_mem_size; extern void collect_sys_info(struct sys_info *info); +// console.c +void cls(void); + // romvec.c extern struct linux_arguments_v0 obp_arg; Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 21:10:01 2010 (r696) @@ -9,9 +9,11 @@ #include "kernel/kernel.h" #include "drivers/drivers.h" #include "openbios.h" -#include "video_subr.h" +#include "libopenbios/console.h" #include "libopenbios/ofmem.h" +void cls(void); + #ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 21:10:01 2010 (r696) @@ -18,7 +18,7 @@ #include "libopenbios/sys_info.h" #include "openbios.h" #include "boot.h" -#include "video_subr.h" +#include "packages/video.h" #define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc64/boot.h Sun Mar 14 21:10:01 2010 (r696) @@ -41,6 +41,7 @@ // console.c void ob_su_init(uint64_t base, uint64_t offset, int intr); +void cls(void); // lib.c void ob_mmu_init(const char *cpuname, uint64_t ram_size); Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 21:10:01 2010 (r696) @@ -11,7 +11,6 @@ #include "drivers/drivers.h" #include "libopenbios/fontdata.h" #include "openbios.h" -#include "video_subr.h" #include "libc/vsprintf.h" #include "libopenbios/sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 21:10:01 2010 (r696) @@ -19,7 +19,6 @@ #include "../../drivers/timer.h" // XXX #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" -#include "video_subr.h" #include "libopenbios/ofmem.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 21:10:01 2010 (r696) @@ -23,7 +23,7 @@ #include "libc/vsprintf.h" #include "drivers/drivers.h" -#include "video_subr.h" +#include "drivers/vga.h" #include "timer.h" #include "pci.h" #include "pci_database.h" Modified: trunk/openbios-devel/drivers/vga.h ============================================================================== --- trunk/openbios-devel/drivers/vga.h Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/vga.h Sun Mar 14 21:10:01 2010 (r696) @@ -14,7 +14,7 @@ #ifndef VGA_H_INCL #define VGA_H_INCL 1 -#include "video_subr.h" +#include "drivers/vga.h" //#include <cpu/p5/io.h> Modified: trunk/openbios-devel/drivers/vga_load_regs.c ============================================================================== --- trunk/openbios-devel/drivers/vga_load_regs.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/vga_load_regs.c Sun Mar 14 21:10:01 2010 (r696) @@ -1,5 +1,5 @@ #include "asm/io.h" -#include "video_subr.h" +#include "drivers/vga.h" #include "vga.h" /* Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 21:10:01 2010 (r696) @@ -24,7 +24,8 @@ #include "libopenbios/fontdata.h" #include "asm/io.h" #include "libc/vsprintf.h" -#include "video_subr.h" +#include "drivers/vga.h" +#include "packages/video.h" #include "libopenbios/ofmem.h" /* VGA init. We use the Bochs VESA VBE extensions */ Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 21:10:01 2010 (r696) @@ -15,7 +15,8 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/fontdata.h" -#include "video_subr.h" +#include "libopenbios/console.h" +#include "packages/video.h" #define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 18:19:58 2010 (r695) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 21:10:01 2010 (r696) @@ -19,7 +19,9 @@ #include "libc/diskio.h" #include "libopenbios/ofmem.h" #include "drivers/drivers.h" -#include "video_subr.h" +#include "packages/video.h" +#include "libopenbios/console.h" +#include "drivers/vga.h" typedef struct osi_fb_info { unsigned long mphys;

1 0

[commit] r695 - 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 arch/x86/xbox drivers fs fs/ext2 f...
by repository service March 14, 2010

March 14, 2010

Author: mcayland Date: Sun Mar 14 18:19:58 2010 New Revision: 695 URL: http://tracker.coreboot.org/trac/openbios/changeset/695 Log: Move the basic OpenBIOS configuration header files from include/openbios to include/. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/config.h (contents, props changed) - copied, changed from r692, trunk/openbios-devel/include/openbios/config.h trunk/openbios-devel/include/sysinclude.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/sysinclude.h Deleted: trunk/openbios-devel/include/openbios/config.h trunk/openbios-devel/include/openbios/sysinclude.h Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/amd64/builtin.c 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/multiboot.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/amd64/plainboot.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/briq/init.c trunk/openbios-devel/arch/ppc/briq/main.c trunk/openbios-devel/arch/ppc/briq/methods.c trunk/openbios-devel/arch/ppc/briq/tree.c trunk/openbios-devel/arch/ppc/briq/vfd.c trunk/openbios-devel/arch/ppc/kernel.c trunk/openbios-devel/arch/ppc/mol/console.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/mol/main.c trunk/openbios-devel/arch/ppc/mol/methods.c trunk/openbios-devel/arch/ppc/mol/mol.c trunk/openbios-devel/arch/ppc/mol/osi-blk.c trunk/openbios-devel/arch/ppc/mol/osi-scsi.c trunk/openbios-devel/arch/ppc/mol/prom.c trunk/openbios-devel/arch/ppc/mol/pseudodisk.c trunk/openbios-devel/arch/ppc/mol/tree.c trunk/openbios-devel/arch/ppc/ofmem.c trunk/openbios-devel/arch/ppc/pearpc/console.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/pearpc/main.c trunk/openbios-devel/arch/ppc/pearpc/methods.c trunk/openbios-devel/arch/ppc/pearpc/pearpc.c trunk/openbios-devel/arch/ppc/pearpc/tree.c trunk/openbios-devel/arch/ppc/pearpc/vfd.c trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/ppc/qemu/vfd.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/builtin.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/multiboot.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/plainboot.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/builtin.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/lib.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/loadfs.c trunk/openbios-devel/arch/sparc64/multiboot.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/sparc64/plainboot.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/unix/blk.c trunk/openbios-devel/arch/unix/boot.c trunk/openbios-devel/arch/unix/plugins.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/builtin.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/exception.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/multiboot.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/plainboot.c trunk/openbios-devel/arch/x86/segment.c trunk/openbios-devel/arch/x86/sys_info.c trunk/openbios-devel/arch/x86/xbox/console.c trunk/openbios-devel/arch/x86/xbox/methods.c trunk/openbios-devel/drivers/adb_bus.c trunk/openbios-devel/drivers/adb_kbd.c trunk/openbios-devel/drivers/adb_mouse.c trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/kbd.c trunk/openbios-devel/drivers/macio.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/pci_database.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/timer.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/fs/ext2/libext2.h trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c trunk/openbios-devel/fs/grubfs/glue.h trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/hfs/block.c trunk/openbios-devel/fs/hfs/btree.c trunk/openbios-devel/fs/hfs/data.c trunk/openbios-devel/fs/hfs/file.c trunk/openbios-devel/fs/hfs/hfs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfs/low.c trunk/openbios-devel/fs/hfs/medium.c trunk/openbios-devel/fs/hfs/node.c trunk/openbios-devel/fs/hfs/record.c trunk/openbios-devel/fs/hfs/volume.c trunk/openbios-devel/fs/hfsplus/blockiter.c trunk/openbios-devel/fs/hfsplus/btree.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/hfsplus/include/swab.h trunk/openbios-devel/fs/hfsplus/libhfsp.c trunk/openbios-devel/fs/hfsplus/record.c trunk/openbios-devel/fs/hfsplus/unicode.c trunk/openbios-devel/fs/hfsplus/volume.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/iso9660/libiso9660.h trunk/openbios-devel/include/drivers/drivers.h trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/include/libc/vsprintf.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/libc/ctype.c trunk/openbios-devel/libc/diskio.c trunk/openbios-devel/libc/extra.c trunk/openbios-devel/libc/misc.c trunk/openbios-devel/libc/string.c trunk/openbios-devel/libc/vsprintf.c trunk/openbios-devel/libopenbios/bindings.c trunk/openbios-devel/libopenbios/client.c trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/libopenbios/elf_info.c trunk/openbios-devel/libopenbios/elfload.c trunk/openbios-devel/libopenbios/linuxbios_info.c trunk/openbios-devel/libopenbios/ofmem_common.c trunk/openbios-devel/packages/bootinfo-loader.c trunk/openbios-devel/packages/cmdline.c trunk/openbios-devel/packages/deblocker.c trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/init.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/nvram.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c trunk/openbios-devel/packages/video.c trunk/openbios-devel/packages/xcoff-loader.c Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/amd64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include <asm/types.h> #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/amd64/console.c ============================================================================== --- trunk/openbios-devel/arch/amd64/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/amd64/context.c ============================================================================== --- trunk/openbios-devel/arch/amd64/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-10 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.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 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/amd64/lib.c ============================================================================== --- trunk/openbios-devel/arch/amd64/lib.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/lib.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include <stdarg.h> #include "libc/stdlib.h" Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/amd64/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/amd64/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/amd64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" Modified: trunk/openbios-devel/arch/amd64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/amd64/segment.c ============================================================================== --- trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/segment.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "relocate.h" Modified: trunk/openbios-devel/arch/amd64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/amd64/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/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 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/briq.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/briq/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/briq/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/briq/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" void devtree_init( void ) Modified: trunk/openbios-devel/arch/ppc/briq/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "briq/briq.h" Modified: trunk/openbios-devel/arch/ppc/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 18:19:58 2010 (r695) @@ -17,7 +17,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "dict.h" #include "libopenbios/bindings.h" #include "kernel/stack.h" Modified: trunk/openbios-devel/arch/ppc/mol/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "mol/mol.h" Modified: trunk/openbios-devel/arch/ppc/mol/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/mol/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "mol/mol.h" Modified: trunk/openbios-devel/arch/ppc/mol/mol.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/mol.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-blk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mol/mol.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-scsi.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mol/mol.h" #include "scsi_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/prom.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/prom.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/prom.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "osi_calls.h" #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/mol/pseudodisk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "osi_calls.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/mol/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mol/mol.h" #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 18:19:58 2010 (r695) @@ -17,7 +17,7 @@ /* TODO: Clean up MOLisms in a decent way */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/pearpc.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/pearpc.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" void devtree_init( void ) Modified: trunk/openbios-devel/arch/ppc/pearpc/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -11,7 +11,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ */ #include "qemu-dict.h" -#include "openbios/config.h" +#include "config.h" #include "dict.h" #include "libopenbios/bindings.h" #include "kernel/stack.h" Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libopenbios/bindings.h" Modified: trunk/openbios-devel/arch/ppc/qemu/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "qemu/qemu.h" Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/a.out.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/sparc32/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "drivers/drivers.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-10 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "context.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "asm/types.h" Modified: trunk/openbios-devel/arch/sparc32/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ */ #include "openprom.h" -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB #include "arch/common/a.out.h" Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/sparc64/builtin.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-10 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "context.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * FCode boot loader */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libc/vsprintf.h" #include "libopenbios/bindings.h" #include "spitfire.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/sparc64/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "ofmem_sparc64.h" Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "dict.h" Modified: trunk/openbios-devel/arch/sparc64/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/unix/blk.c ============================================================================== --- trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 18:19:58 2010 (r695) @@ -11,7 +11,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "blk.h" Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ * */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/unix/plugins.c ============================================================================== --- trunk/openbios-devel/arch/unix/plugins.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/plugins.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 18:19:58 2010 (r695) @@ -24,9 +24,9 @@ #include <getopt.h> #endif -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include "mconfig.h" -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "dict.h" #include "kernel/stack.h" Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ */ #undef BOOTSTRAP -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/arch/x86/builtin.c ============================================================================== --- trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/builtin.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" /* Modified: trunk/openbios-devel/arch/x86/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "openbios.h" Modified: trunk/openbios-devel/arch/x86/context.c ============================================================================== --- trunk/openbios-devel/arch/x86/context.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/context.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "segment.h" #include "context.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "arch/common/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/arch/x86/exception.c ============================================================================== --- trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "asm/types.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/x86/lib.c ============================================================================== --- trunk/openbios-devel/arch/x86/lib.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/lib.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "asm/types.h" #include <stdarg.h> #include "libc/stdlib.h" Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * 2003-09 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "libopenbios/sys_info.h" Modified: trunk/openbios-devel/arch/x86/loadfs.c ============================================================================== --- trunk/openbios-devel/arch/x86/loadfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/loadfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libc/diskio.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/x86/multiboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/multiboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "config.h" #include "asm/io.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" Modified: trunk/openbios-devel/arch/x86/plainboot.c ============================================================================== --- trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/plainboot.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/sys_info.h" #include "multiboot.h" Modified: trunk/openbios-devel/arch/x86/segment.c ============================================================================== --- trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/segment.c Sun Mar 14 18:19:58 2010 (r695) @@ -3,7 +3,7 @@ * 2003-07 by SONE Takeshi */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "relocate.h" Modified: trunk/openbios-devel/arch/x86/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/sys_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/sys_info.h" #include "context.h" Modified: trunk/openbios-devel/arch/x86/xbox/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 18:19:58 2010 (r695) @@ -10,7 +10,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/x86/xbox/methods.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" // #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/drivers/adb_bus.c ============================================================================== --- trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/adb_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/adb_mouse.c ============================================================================== --- trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/cuda.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/escc.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 18:19:58 2010 (r695) @@ -13,7 +13,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 18:19:58 2010 (r695) @@ -13,7 +13,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/iommu.c Sun Mar 14 18:19:58 2010 (r695) @@ -4,7 +4,7 @@ ** Copyright 1999 Pete Zaitcev ** This code is licensed under GNU General Public License. **/ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "iommu.h" Modified: trunk/openbios-devel/drivers/kbd.c ============================================================================== --- trunk/openbios-devel/drivers/kbd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/kbd.c Sun Mar 14 18:19:58 2010 (r695) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "asm/types.h" #include "kbd.h" Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 18:19:58 2010 (r695) @@ -8,7 +8,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "openbios/nvram.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 18:19:58 2010 (r695) @@ -10,7 +10,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 18:19:58 2010 (r695) @@ -5,7 +5,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/drivers.h" Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "drivers/pci.h" Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,4 +1,4 @@ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 18:19:58 2010 (r695) @@ -10,7 +10,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/timer.c ============================================================================== --- trunk/openbios-devel/drivers/timer.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/timer.c Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "timer.h" #include "asm/io.h" Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 18:19:58 2010 (r695) @@ -16,7 +16,7 @@ * MA 02110-1301, USA. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" #include "drivers/pci.h" Modified: trunk/openbios-devel/fs/ext2/libext2.h ============================================================================== --- trunk/openbios-devel/fs/ext2/libext2.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/ext2/libext2.h Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ #ifndef __LIBEXT2_H__ #define __LIBEXT2_H__ -#include "openbios/config.h" +#include "config.h" #include "ext2.h" extern ext2_VOLUME* ext2_mount(int fd); Modified: trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ #ifdef FSYS_EXT2FS -#include "openbios/config.h" +#include "config.h" #include "shared.h" #include "filesys.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/fs/grubfs/glue.h ============================================================================== --- trunk/openbios-devel/fs/grubfs/glue.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/grubfs/glue.h Sun Mar 14 18:19:58 2010 (r695) @@ -2,7 +2,7 @@ #define __GLUE_H #include "asm/types.h" -#include "openbios/config.h" +#include "config.h" #include "libc/byteorder.h" typedef uint64_t sector_t; Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "fs/fs.h" #include "filesys.h" Modified: trunk/openbios-devel/fs/hfs/block.c ============================================================================== --- trunk/openbios-devel/fs/hfs/block.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/block.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: block.c,v 1.11 1998/11/02 22:08:52 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "volume.h" Modified: trunk/openbios-devel/fs/hfs/btree.c ============================================================================== --- trunk/openbios-devel/fs/hfs/btree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/btree.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: btree.c,v 1.10 1998/11/02 22:08:54 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "btree.h" Modified: trunk/openbios-devel/fs/hfs/data.c ============================================================================== --- trunk/openbios-devel/fs/hfs/data.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/data.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: data.c,v 1.7 1998/11/02 22:08:57 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "data.h" #define TIMEDIFF 2082844800UL Modified: trunk/openbios-devel/fs/hfs/file.c ============================================================================== --- trunk/openbios-devel/fs/hfs/file.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/file.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: file.c,v 1.9 1998/11/02 22:08:59 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "file.h" #include "btree.h" Modified: trunk/openbios-devel/fs/hfs/hfs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/hfs.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: hfs.c,v 1.15 1998/11/02 22:09:00 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "data.h" #include "block.h" Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "fs/fs.h" #include "libc/vsprintf.h" #include "libhfs.h" Modified: trunk/openbios-devel/fs/hfs/low.c ============================================================================== --- trunk/openbios-devel/fs/hfs/low.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/low.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: low.c,v 1.8 1998/11/02 22:09:03 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "low.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfs/medium.c ============================================================================== --- trunk/openbios-devel/fs/hfs/medium.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/medium.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: medium.c,v 1.4 1998/11/02 22:09:04 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "block.h" #include "low.h" Modified: trunk/openbios-devel/fs/hfs/node.c ============================================================================== --- trunk/openbios-devel/fs/hfs/node.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/node.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: node.c,v 1.9 1998/11/02 22:09:05 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "node.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfs/record.c ============================================================================== --- trunk/openbios-devel/fs/hfs/record.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/record.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: record.c,v 1.9 1998/11/02 22:09:07 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "record.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfs/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfs/volume.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfs/volume.c Sun Mar 14 18:19:58 2010 (r695) @@ -20,7 +20,7 @@ * $Id: volume.c,v 1.12 1998/11/02 22:09:10 rob Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfs.h" #include "volume.h" #include "data.h" Modified: trunk/openbios-devel/fs/hfsplus/blockiter.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/blockiter.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/blockiter.c Sun Mar 14 18:19:58 2010 (r695) @@ -25,7 +25,7 @@ * $Id: blockiter.c,v 1.2 2000/10/17 05:58:46 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "blockiter.h" #include "volume.h" Modified: trunk/openbios-devel/fs/hfsplus/btree.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/btree.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/btree.c Sun Mar 14 18:19:58 2010 (r695) @@ -28,7 +28,7 @@ * $Id: btree.c,v 1.14 2000/10/25 05:43:04 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "volume.h" #include "btree.h" Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "fs/fs.h" #include "libhfsp.h" #include "volume.h" Modified: trunk/openbios-devel/fs/hfsplus/include/swab.h ============================================================================== --- trunk/openbios-devel/fs/hfsplus/include/swab.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/include/swab.h Sun Mar 14 18:19:58 2010 (r695) @@ -25,7 +25,7 @@ * $Id: swab.h,v 1.1.1.1 2002/03/05 19:50:29 klaus Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libc/byteorder.h" /* basic fuction: Modified: trunk/openbios-devel/fs/hfsplus/libhfsp.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/libhfsp.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/libhfsp.c Sun Mar 14 18:19:58 2010 (r695) @@ -23,7 +23,7 @@ * $Id: libhfsp.c,v 1.1.1.1 2000/07/25 10:33:40 kkaempf Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" const char *hfsp_error = "no error"; /* static error string */ Modified: trunk/openbios-devel/fs/hfsplus/record.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/record.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/record.c Sun Mar 14 18:19:58 2010 (r695) @@ -26,7 +26,7 @@ * $Id: record.c,v 1.24 2000/10/17 05:58:46 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "hfstime.h" #include "record.h" Modified: trunk/openbios-devel/fs/hfsplus/unicode.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/unicode.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/unicode.c Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "unicode.h" Modified: trunk/openbios-devel/fs/hfsplus/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/volume.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/hfsplus/volume.c Sun Mar 14 18:19:58 2010 (r695) @@ -25,7 +25,7 @@ * $Id: volume.c,v 1.21 2000/10/25 05:43:04 hasi Exp $ */ -#include "openbios/config.h" +#include "config.h" #include "libhfsp.h" #include "volume.h" #include "record.h" Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/ioglue.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/fs/iso9660/libiso9660.h ============================================================================== --- trunk/openbios-devel/fs/iso9660/libiso9660.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/fs/iso9660/libiso9660.h Sun Mar 14 18:19:58 2010 (r695) @@ -9,7 +9,7 @@ #ifndef __LIBISO9660_H__ #define __LIBISO9660_H__ -#include "openbios/config.h" +#include "config.h" #include "iso9660.h" extern iso9660_VOLUME* iso9660_mount(int fd); Copied and modified: trunk/openbios-devel/include/config.h (from r692, trunk/openbios-devel/include/openbios/config.h) ============================================================================== --- trunk/openbios-devel/include/openbios/config.h Sun Mar 14 16:19:41 2010 (r692, copy source) +++ trunk/openbios-devel/include/config.h Sun Mar 14 18:19:58 2010 (r695) @@ -60,7 +60,7 @@ #endif /* BOOTSTRAP */ -#include "openbios/sysinclude.h" +#include "sysinclude.h" #ifndef MIN #define MIN(x,y) (((x) < (y)) ? (x) : (y)) Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/include/drivers/drivers.h Sun Mar 14 18:19:58 2010 (r695) @@ -11,7 +11,7 @@ #ifndef OPENBIOS_DRIVERS_H #define OPENBIOS_DRIVERS_H -#include "openbios/config.h" +#include "config.h" #ifdef CONFIG_DRIVER_PCI /* drivers/pci.c */ Modified: trunk/openbios-devel/include/libc/string.h ============================================================================== --- trunk/openbios-devel/include/libc/string.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/include/libc/string.h Sun Mar 14 18:19:58 2010 (r695) @@ -17,7 +17,7 @@ #ifndef _H_STRING #define _H_STRING -#include "openbios/config.h" +#include "config.h" #define bzero(s,n) memset( s, 0, n ) #define atol(nptr) strtol(nptr, NULL, 10 ) Modified: trunk/openbios-devel/include/libc/vsprintf.h ============================================================================== --- trunk/openbios-devel/include/libc/vsprintf.h Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/include/libc/vsprintf.h Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ #define _H_VSPRINTF #include <stdarg.h> -#include "openbios/config.h" +#include "config.h" extern int vsprintf(char *buf, const char *fmt, va_list args ); extern int sprintf(char * buf, const char *fmt, ...); Copied: trunk/openbios-devel/include/sysinclude.h (from r692, trunk/openbios-devel/include/openbios/sysinclude.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/sysinclude.h Sun Mar 14 18:19:58 2010 (r695, copy of r692, trunk/openbios-devel/include/openbios/sysinclude.h) @@ -0,0 +1,20 @@ +#ifndef __SYSINCLUDE_H +#define __SYSINCLUDE_H + +#ifdef BOOTSTRAP +#include "asm/types.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#else /* BOOTSTRAP */ +#include "libc/stdlib.h" +#include "libc/string.h" +#endif /* BOOTSTRAP */ + +extern int printk( const char *fmt, ... ) \ + __attribute__ ((format (printf, 1, 2))); +#ifdef BOOTSTRAP +#define printk printf +#endif + +#endif /* __SYSINCLUDE_H */ Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/bootstrap.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,7 +6,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -21,9 +21,9 @@ #include <getopt.h> #endif -#include "openbios/config.h" +#include "config.h" #include "kernel/stack.h" -#include "openbios/sysinclude.h" +#include "sysinclude.h" #include "kernel/kernel.h" #include "dict.h" #include "cross.h" Modified: trunk/openbios-devel/kernel/dict.c ============================================================================== --- trunk/openbios-devel/kernel/dict.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/dict.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "dict.h" #ifdef BOOTSTRAP Modified: trunk/openbios-devel/kernel/primitives.c ============================================================================== --- trunk/openbios-devel/kernel/primitives.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/primitives.c Sun Mar 14 18:19:58 2010 (r695) @@ -6,8 +6,8 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" -#include "openbios/sysinclude.h" +#include "config.h" +#include "sysinclude.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 18:06:20 2010 (r694) +++ trunk/openbios-devel/kernel/stack.c Sun Mar 14 18:19:58 2010 (r695) @@ -7,7 +7,7 @@ */ -#include "openbios/config.h" +#include "config.h" #include "kernel/stack.h" #include "cross.h" Modified: trunk/openbios-devel/libc/ctype.c ============================================================================== --- trunk/openbios-devel/libc/ctype.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/ctype.c Sun Mar 14 18:19:58 2010 (r695) @@ -4,7 +4,7 @@ * Copyright (C) 1991, 1992 Linus Torvalds */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" const unsigned char _ctype[] = { Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/diskio.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/libc/extra.c ============================================================================== --- trunk/openbios-devel/libc/extra.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/extra.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "libc/vsprintf.h" #include "libopenbios/bindings.h" Modified: trunk/openbios-devel/libc/misc.c ============================================================================== --- trunk/openbios-devel/libc/misc.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/misc.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" int errno_int; Modified: trunk/openbios-devel/libc/string.c ============================================================================== --- trunk/openbios-devel/libc/string.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/string.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * reentrant and should be faster). Use only strsep() in new code, please. */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "libc/stdlib.h" Modified: trunk/openbios-devel/libc/vsprintf.c ============================================================================== --- trunk/openbios-devel/libc/vsprintf.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libc/vsprintf.c Sun Mar 14 18:19:58 2010 (r695) @@ -18,7 +18,7 @@ * - changed to provide snprintf and vsnprintf functions */ -#include "openbios/config.h" +#include "config.h" #include "libc/string.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/libopenbios/bindings.c ============================================================================== --- trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/string.h" #include "libc/stdlib.h" Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/client.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/of.h" Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/fontdata.h" #include "video_subr.h" Modified: trunk/openbios-devel/libopenbios/elf_info.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,5 +1,5 @@ /* Support for ELF Boot Proposal as a boot image */ -#include "openbios/config.h" +#include "config.h" #include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "asm/io.h" Modified: trunk/openbios-devel/libopenbios/elfload.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 18:19:58 2010 (r695) @@ -29,7 +29,7 @@ (at your option) any later version. */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/libopenbios/linuxbios_info.c ============================================================================== --- trunk/openbios-devel/libopenbios/linuxbios_info.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/linuxbios_info.c Sun Mar 14 18:19:58 2010 (r695) @@ -1,7 +1,7 @@ /* Adapted from Etherboot 5.1.8 */ -#include "openbios/config.h" -#include "openbios/sysinclude.h" +#include "config.h" +#include "sysinclude.h" #include "asm/types.h" #include "asm/io.h" #include "linuxbios.h" Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/bootinfo-loader.c ============================================================================== --- trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/cmdline.c ============================================================================== --- trunk/openbios-devel/packages/cmdline.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/cmdline.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/packages/deblocker.c ============================================================================== --- trunk/openbios-devel/packages/deblocker.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/deblocker.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/disk-label.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/init.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "kernel/kernel.h" #include "packages.h" Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "mac-parts.h" #include "packages.h" Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/misc-files.c Sun Mar 14 18:19:58 2010 (r695) @@ -15,7 +15,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/nvram.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "openbios/nvram.h" Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 18:19:58 2010 (r695) @@ -12,7 +12,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/packages/xcoff-loader.c ============================================================================== --- trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 18:06:20 2010 (r694) +++ trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 18:19:58 2010 (r695) @@ -14,7 +14,7 @@ * */ -#include "openbios/config.h" +#include "config.h" #include "libopenbios/bindings.h" #include "packages.h" #include "libopenbios/ofmem.h"

1 0

[commit] r694 - in trunk/openbios-devel: arch/amd64 arch/sparc32 arch/sparc64 arch/x86 include include/arch/common include/libopenbios include/openbios libopenbios packages
by repository service March 14, 2010

March 14, 2010

Author: mcayland Date: Sun Mar 14 18:06:20 2010 New Revision: 694 URL: http://tracker.coreboot.org/trac/openbios/changeset/694 Log: Move the a.out, ELF and XCOFF header files down into include/arch/common. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/common/a.out.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/a.out.h trunk/openbios-devel/include/arch/common/elf.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/elf.h trunk/openbios-devel/include/arch/common/elf_boot.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/elf_boot.h trunk/openbios-devel/include/arch/common/xcoff.h (props changed) - copied unchanged from r692, trunk/openbios-devel/include/openbios/xcoff.h Deleted: trunk/openbios-devel/include/a.out.h trunk/openbios-devel/include/elf_boot.h trunk/openbios-devel/include/openbios/elf.h trunk/openbios-devel/include/openbios/xcoff.h Modified: trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/sparc32/aoutload.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/sys_info.c trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/elfload.c trunk/openbios-devel/arch/sparc64/sys_info.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/include/libopenbios/elfload.h trunk/openbios-devel/libopenbios/elf_info.c trunk/openbios-devel/libopenbios/elfload.c trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/xcoff-loader.c Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc32/aoutload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,7 +5,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "a.out.h" +#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc32/sys_info.c Sun Mar 14 18:06:20 2010 (r694) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/aoutload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc64/aoutload.c Sun Mar 14 18:06:20 2010 (r694) @@ -6,7 +6,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #define CONFIG_SPARC64_PAGE_SIZE_8KB -#include "a.out.h" +#include "arch/common/a.out.h" #include "libopenbios/sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/sys_info.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/sparc64/sys_info.c Sun Mar 14 18:06:20 2010 (r694) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "context.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -5,9 +5,9 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "loadfs.h" Copied: trunk/openbios-devel/include/arch/common/a.out.h (from r692, trunk/openbios-devel/include/a.out.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/a.out.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/a.out.h) @@ -0,0 +1,271 @@ +#ifndef __A_OUT_GNU_H__ +#define __A_OUT_GNU_H__ + +#define __GNU_EXEC_MACROS__ + +#ifndef __STRUCT_EXEC_OVERRIDE__ + +#include "asm/a.out.h" + +#endif /* __STRUCT_EXEC_OVERRIDE__ */ + +/* these go in the N_MACHTYPE field */ +enum machine_type { +#if defined (M_OLDSUN2) + M__OLDSUN2 = M_OLDSUN2, +#else + M_OLDSUN2 = 0, +#endif +#if defined (M_68010) + M__68010 = M_68010, +#else + M_68010 = 1, +#endif +#if defined (M_68020) + M__68020 = M_68020, +#else + M_68020 = 2, +#endif +#if defined (M_SPARC) + M__SPARC = M_SPARC, +#else + M_SPARC = 3, +#endif + /* skip a bunch so we don't run into any of sun's numbers */ + M_386 = 100, + M_MIPS1 = 151, /* MIPS R3000/R3000 binary */ + M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ +}; + +#if !defined (N_MAGIC) +#define N_MAGIC(exec) ((exec).a_info & 0xffff) +#endif +#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff)) +#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff) +#define N_SET_INFO(exec, magic, type, flags) \ + ((exec).a_info = ((magic) & 0xffff) \ + | (((int)(type) & 0xff) << 16) \ + | (((flags) & 0xff) << 24)) +#define N_SET_MAGIC(exec, magic) \ + ((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff))) + +#define N_SET_MACHTYPE(exec, machtype) \ + ((exec).a_info = \ + ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16)) + +#define N_SET_FLAGS(exec, flags) \ + ((exec).a_info = \ + ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24)) + +/* Code indicating object file or impure executable. */ +#define OMAGIC 0407 +/* Code indicating pure executable. */ +#define NMAGIC 0410 +/* Code indicating demand-paged executable. */ +#define ZMAGIC 0413 +/* This indicates a demand-paged executable with the header in the text. + The first page is unmapped to help trap NULL pointer references */ +#define QMAGIC 0314 + +/* Code indicating core file. */ +#define CMAGIC 0421 + +#if !defined (N_BADMAG) +#define N_BADMAG(x) (N_MAGIC(x) != OMAGIC \ + && N_MAGIC(x) != NMAGIC \ + && N_MAGIC(x) != ZMAGIC \ + && N_MAGIC(x) != QMAGIC) +#endif + +#define _N_HDROFF(x) (1024 - sizeof (struct exec)) + +#if !defined (N_TXTOFF) +#define N_TXTOFF(x) \ + (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \ + (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec))) +#endif + +#if !defined (N_DATOFF) +#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text) +#endif + +#if !defined (N_TRELOFF) +#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data) +#endif + +#if !defined (N_DRELOFF) +#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x)) +#endif + +#if !defined (N_SYMOFF) +#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x)) +#endif + +#if !defined (N_STROFF) +#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x)) +#endif + +/* Address of text segment in memory after it is loaded. */ +#if !defined (N_TXTADDR) +#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0) +#endif + +/* Address of data segment in memory after it is loaded. + Note that it is up to you to define SEGMENT_SIZE + on machines not listed here. */ +#if defined(vax) || defined(hp300) || defined(pyr) +#define SEGMENT_SIZE page_size +#endif +#ifdef sony +#define SEGMENT_SIZE 0x2000 +#endif /* Sony. */ +#ifdef is68k +#define SEGMENT_SIZE 0x20000 +#endif +#if defined(m68k) && defined(PORTAR) +#define PAGE_SIZE 0x400 +#define SEGMENT_SIZE PAGE_SIZE +#endif + +#if !defined(SEGMENT_SIZE) +#ifdef linux +#if defined(__i386__) || defined(__mc68000__) +#define SEGMENT_SIZE 1024 +#elif defined(__sparc__) +#define SEGMENT_SIZE 0x2000 +#else +#if defined(PAGE_SIZE) +#define SEGMENT_SIZE PAGE_SIZE +#endif +#endif +#endif +#endif + +#define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1)) + +#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text) + +#ifndef N_DATADDR +#define N_DATADDR(x) \ + (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) \ + : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x)))) +#endif + +/* Address of bss segment in memory after it is loaded. */ +#if !defined (N_BSSADDR) +#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data) +#endif + +#if !defined (N_NLIST_DECLARED) +struct nlist { + union { + char *n_name; + struct nlist *n_next; + long n_strx; + } n_un; + unsigned char n_type; + char n_other; + short n_desc; + unsigned long n_value; +}; +#endif /* no N_NLIST_DECLARED. */ + +#if !defined (N_UNDF) +#define N_UNDF 0 +#endif +#if !defined (N_ABS) +#define N_ABS 2 +#endif +#if !defined (N_TEXT) +#define N_TEXT 4 +#endif +#if !defined (N_DATA) +#define N_DATA 6 +#endif +#if !defined (N_BSS) +#define N_BSS 8 +#endif +#if !defined (N_FN) +#define N_FN 15 +#endif + +#if !defined (N_EXT) +#define N_EXT 1 +#endif +#if !defined (N_TYPE) +#define N_TYPE 036 +#endif +#if !defined (N_STAB) +#define N_STAB 0340 +#endif + +/* The following type indicates the definition of a symbol as being + an indirect reference to another symbol. The other symbol + appears as an undefined reference, immediately following this symbol. + + Indirection is asymmetrical. The other symbol's value will be used + to satisfy requests for the indirect symbol, but not vice versa. + If the other symbol does not have a definition, libraries will + be searched to find a definition. */ +#define N_INDR 0xa + +/* The following symbols refer to set elements. + All the N_SET[ATDB] symbols with the same name form one set. + Space is allocated for the set in the text section, and each set + element's value is stored into one word of the space. + The first word of the space is the length of the set (number of elements). + + The address of the set is made into an N_SETV symbol + whose name is the same as the name of the set. + This symbol acts like a N_DATA global symbol + in that it can satisfy undefined external references. */ + +/* These appear as input to LD, in a .o file. */ +#define N_SETA 0x14 /* Absolute set element symbol */ +#define N_SETT 0x16 /* Text set element symbol */ +#define N_SETD 0x18 /* Data set element symbol */ +#define N_SETB 0x1A /* Bss set element symbol */ + +/* This is output from LD. */ +#define N_SETV 0x1C /* Pointer to set vector in data area. */ + +#if !defined (N_RELOCATION_INFO_DECLARED) +/* This structure describes a single relocation to be performed. + The text-relocation section of the file is a vector of these structures, + all of which apply to the text section. + Likewise, the data-relocation section applies to the data section. */ + +struct relocation_info +{ + /* Address (within segment) to be relocated. */ + int r_address; + /* The meaning of r_symbolnum depends on r_extern. */ + unsigned int r_symbolnum:24; + /* Nonzero means value is a pc-relative offset + and it should be relocated for changes in its own address + as well as for changes in the symbol or section specified. */ + unsigned int r_pcrel:1; + /* Length (as exponent of 2) of the field to be relocated. + Thus, a value of 2 indicates 1<<2 bytes. */ + unsigned int r_length:2; + /* 1 => relocate with value of symbol. + r_symbolnum is the index of the symbol + in file's the symbol table. + 0 => relocate with the address of a segment. + r_symbolnum is N_TEXT, N_DATA, N_BSS or N_ABS + (the N_EXT bit may be set also, but signifies nothing). */ + unsigned int r_extern:1; + /* Four bits that aren't used, but when writing an object file + it is desirable to clear them. */ +#ifdef NS32K + unsigned r_bsr:1; + unsigned r_disp:1; + unsigned r_pad:2; +#else + unsigned int r_pad:4; +#endif +}; +#endif /* no N_RELOCATION_INFO_DECLARED. */ + + +#endif /* __A_OUT_GNU_H__ */ Copied: trunk/openbios-devel/include/arch/common/elf.h (from r692, trunk/openbios-devel/include/openbios/elf.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/elf.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/openbios/elf.h) @@ -0,0 +1,227 @@ +#ifndef ELF_H +#define ELF_H + +#define EI_NIDENT 16 /* Size of e_ident array. */ + +/* Values for e_type. */ +#define ET_NONE 0 /* No file type */ +#define ET_REL 1 /* Relocatable file */ +#define ET_EXEC 2 /* Executable file */ +#define ET_DYN 3 /* Shared object file */ +#define ET_CORE 4 /* Core file */ + +/* Values for e_machine (architecute). */ +#define EM_NONE 0 /* No machine */ +#define EM_M32 1 /* AT&T WE 32100 */ +#define EM_SPARC 2 /* SUN SPARC */ +#define EM_386 3 /* Intel 80386+ */ +#define EM_68K 4 /* Motorola m68k family */ +#define EM_88K 5 /* Motorola m88k family */ +#define EM_486 6 /* Perhaps disused */ +#define EM_860 7 /* Intel 80860 */ +#define EM_MIPS 8 /* MIPS R3000 big-endian */ +#define EM_S370 9 /* IBM System/370 */ +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ + +#define EM_PARISC 15 /* HPPA */ +#define EM_VPP500 17 /* Fujitsu VPP500 */ +#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ +#define EM_960 19 /* Intel 80960 */ +#define EM_PPC 20 /* PowerPC */ +#define EM_PPC64 21 /* PowerPC 64-bit */ +#define EM_S390 22 /* IBM S390 */ + +#define EM_V800 36 /* NEC V800 series */ +#define EM_FR20 37 /* Fujitsu FR20 */ +#define EM_RH32 38 /* TRW RH-32 */ +#define EM_RCE 39 /* Motorola RCE */ +#define EM_ARM 40 /* ARM */ +#define EM_FAKE_ALPHA 41 /* Digital Alpha */ +#define EM_SH 42 /* Hitachi SH */ +#define EM_SPARCV9 43 /* SPARC v9 64-bit */ +#define EM_TRICORE 44 /* Siemens Tricore */ +#define EM_ARC 45 /* Argonaut RISC Core */ +#define EM_H8_300 46 /* Hitachi H8/300 */ +#define EM_H8_300H 47 /* Hitachi H8/300H */ +#define EM_H8S 48 /* Hitachi H8S */ +#define EM_H8_500 49 /* Hitachi H8/500 */ +#define EM_IA_64 50 /* Intel Merced */ +#define EM_MIPS_X 51 /* Stanford MIPS-X */ +#define EM_COLDFIRE 52 /* Motorola Coldfire */ +#define EM_68HC12 53 /* Motorola M68HC12 */ +#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator*/ +#define EM_PCP 55 /* Siemens PCP */ +#define EM_NCPU 56 /* Sony nCPU embeeded RISC */ +#define EM_NDR1 57 /* Denso NDR1 microprocessor */ +#define EM_STARCORE 58 /* Motorola Start*Core processor */ +#define EM_ME16 59 /* Toyota ME16 processor */ +#define EM_ST100 60 /* STMicroelectronic ST100 processor */ +#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/ +#define EM_X86_64 62 /* AMD x86-64 architecture */ +#define EM_PDSP 63 /* Sony DSP Processor */ + +#define EM_FX66 66 /* Siemens FX66 microcontroller */ +#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */ +#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */ +#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */ +#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */ +#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */ +#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */ +#define EM_SVX 73 /* Silicon Graphics SVx */ +#define EM_AT19 74 /* STMicroelectronics ST19 8 bit mc */ +#define EM_VAX 75 /* Digital VAX */ +#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ +#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */ +#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor */ +#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor */ +#define EM_MMIX 80 /* Donald Knuth's educational 64-bit processor */ +#define EM_HUANY 81 /* Harvard University machine-independent object files */ +#define EM_PRISM 82 /* SiTera Prism */ +#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */ +#define EM_FR30 84 /* Fujitsu FR30 */ +#define EM_D10V 85 /* Mitsubishi D10V */ +#define EM_D30V 86 /* Mitsubishi D30V */ +#define EM_V850 87 /* NEC v850 */ +#define EM_M32R 88 /* Mitsubishi M32R */ +#define EM_MN10300 89 /* Matsushita MN10300 */ +#define EM_MN10200 90 /* Matsushita MN10200 */ +#define EM_PJ 91 /* picoJava */ +#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ +#define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */ +#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ +#define EM_NUM 95 + +/* Values for p_type. */ +#define PT_NULL 0 /* Unused entry. */ +#define PT_LOAD 1 /* Loadable segment. */ +#define PT_DYNAMIC 2 /* Dynamic linking information segment. */ +#define PT_INTERP 3 /* Pathname of interpreter. */ +#define PT_NOTE 4 /* Auxiliary information. */ +#define PT_SHLIB 5 /* Reserved (not used). */ +#define PT_PHDR 6 /* Location of program header itself. */ + +/* Values for p_flags. */ +#define PF_X 0x1 /* Executable. */ +#define PF_W 0x2 /* Writable. */ +#define PF_R 0x4 /* Readable. */ + + +#define ELF_PROGRAM_RETURNS_BIT 0x8000000 /* e_flags bit 31 */ + +#define EI_MAG0 0 +#define ELFMAG0 0x7f + +#define EI_MAG1 1 +#define ELFMAG1 'E' + +#define EI_MAG2 2 +#define ELFMAG2 'L' + +#define EI_MAG3 3 +#define ELFMAG3 'F' + +#define ELFMAG "\177ELF" + +#define EI_CLASS 4 /* File class byte index */ +#define ELFCLASSNONE 0 /* Invalid class */ +#define ELFCLASS32 1 /* 32-bit objects */ +#define ELFCLASS64 2 /* 64-bit objects */ + +#define EI_DATA 5 /* Data encodeing byte index */ +#define ELFDATANONE 0 /* Invalid data encoding */ +#define ELFDATA2LSB 1 /* 2's complement little endian */ +#define ELFDATA2MSB 2 /* 2's complement big endian */ + +#define EI_VERSION 6 /* File version byte index */ + /* Value must be EV_CURRENT */ + +#define EV_NONE 0 /* Invalid ELF Version */ +#define EV_CURRENT 1 /* Current version */ + +#define ELF32_PHDR_SIZE (8*4) /* Size of an elf program header */ + +#ifndef __ASSEMBLY__ +#include "asm/types.h" +/* + * ELF definitions common to all 32-bit architectures. + */ + +typedef uint32_t Elf32_Addr; +typedef uint16_t Elf32_Half; +typedef uint32_t Elf32_Off; +typedef int32_t Elf32_Sword; +typedef uint32_t Elf32_Word; +typedef uint32_t Elf32_Size; + +typedef uint64_t Elf64_Addr; +typedef uint16_t Elf64_Half; +typedef uint64_t Elf64_Off; +typedef int32_t Elf64_Sword; +typedef uint32_t Elf64_Word; +typedef uint64_t Elf64_Size; + +/* + * ELF header. + */ +typedef struct { + unsigned char e_ident[EI_NIDENT]; /* File identification. */ + Elf32_Half e_type; /* File type. */ + Elf32_Half e_machine; /* Machine architecture. */ + Elf32_Word e_version; /* ELF format version. */ + Elf32_Addr e_entry; /* Entry point. */ + Elf32_Off e_phoff; /* Program header file offset. */ + Elf32_Off e_shoff; /* Section header file offset. */ + Elf32_Word e_flags; /* Architecture-specific flags. */ + Elf32_Half e_ehsize; /* Size of ELF header in bytes. */ + Elf32_Half e_phentsize; /* Size of program header entry. */ + Elf32_Half e_phnum; /* Number of program header entries. */ + Elf32_Half e_shentsize; /* Size of section header entry. */ + Elf32_Half e_shnum; /* Number of section header entries. */ + Elf32_Half e_shstrndx; /* Section name strings section. */ +} Elf32_Ehdr; + +typedef struct { + unsigned char e_ident[EI_NIDENT]; /* File identification. */ + Elf64_Half e_type; /* File type. */ + Elf64_Half e_machine; /* Machine architecture. */ + Elf64_Word e_version; /* ELF format version. */ + Elf64_Addr e_entry; /* Entry point. */ + Elf64_Off e_phoff; /* Program header file offset. */ + Elf64_Off e_shoff; /* Section header file offset. */ + Elf64_Word e_flags; /* Architecture-specific flags. */ + Elf64_Half e_ehsize; /* Size of ELF header in bytes. */ + Elf64_Half e_phentsize; /* Size of program header entry. */ + Elf64_Half e_phnum; /* Number of program header entries. */ + Elf64_Half e_shentsize; /* Size of section header entry. */ + Elf64_Half e_shnum; /* Number of section header entries. */ + Elf64_Half e_shstrndx; /* Section name strings section. */ +} Elf64_Ehdr; + +/* + * Program header. + */ +typedef struct { + Elf32_Word p_type; /* Entry type. */ + Elf32_Off p_offset; /* File offset of contents. */ + Elf32_Addr p_vaddr; /* Virtual address (not used). */ + Elf32_Addr p_paddr; /* Physical address. */ + Elf32_Size p_filesz; /* Size of contents in file. */ + Elf32_Size p_memsz; /* Size of contents in memory. */ + Elf32_Word p_flags; /* Access permission flags. */ + Elf32_Size p_align; /* Alignment in memory and file. */ +} Elf32_Phdr; + +typedef struct { + Elf64_Word p_type; /* Entry type. */ + Elf64_Word p_flags; /* Access permission flags. */ + Elf64_Off p_offset; /* File offset of contents. */ + Elf64_Addr p_vaddr; /* Virtual address (not used). */ + Elf64_Addr p_paddr; /* Physical address. */ + Elf64_Size p_filesz; /* Size of contents in file. */ + Elf64_Size p_memsz; /* Size of contents in memory. */ + Elf64_Size p_align; /* Alignment in memory and file. */ +} Elf64_Phdr; + +#endif /* __ASSEMBLY__ */ + +#endif /* ELF_H */ Copied: trunk/openbios-devel/include/arch/common/elf_boot.h (from r692, trunk/openbios-devel/include/elf_boot.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/elf_boot.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/elf_boot.h) @@ -0,0 +1,105 @@ +#ifndef ELF_BOOT_H +#define ELF_BOOT_H + + +/* This defines the structure of a table of parameters useful for ELF + * bootable images. These parameters are all passed and generated + * by the bootloader to the booted image. For simplicity and + * consistency the Elf Note format is reused. + * + * All of the information must be Position Independent Data. + * That is it must be safe to relocate the whole ELF boot parameter + * block without changing the meaning or correctnes of the data. + * Additionally it must be safe to permute the order of the ELF notes + * to any possible permutation without changing the meaning or correctness + * of the data. + * + */ + +#define ELF_BHDR_MAGIC 0x0E1FB007 + +#ifndef __ASSEMBLY__ +typedef uint16_t Elf_Half; +typedef uint32_t Elf_Word; + +/* + * Elf boot notes... + */ + +typedef struct Elf_Bhdr +{ + Elf_Word b_signature; /* "0x0E1FB007" */ + Elf_Word b_size; + Elf_Half b_checksum; + Elf_Half b_records; +} Elf_Bhdr; + +/* + * ELF Notes. + */ + +typedef struct Elf_Nhdr +{ + Elf_Word n_namesz; /* Length of the note's name. */ + Elf_Word n_descsz; /* Length of the note's descriptor. */ + Elf_Word n_type; /* Type of the note. */ +} Elf_Nhdr; + +#endif /* __ASSEMBLY__ */ + +/* Standardized Elf image notes for booting... The name for all of these is ELFBoot */ +#define ELF_NOTE_BOOT "ELFBoot" + +#define EIN_PROGRAM_NAME 0x00000001 +/* The program in this ELF file */ +#define EIN_PROGRAM_VERSION 0x00000002 +/* The version of the program in this ELF file */ +#define EIN_PROGRAM_CHECKSUM 0x00000003 +/* ip style checksum of the memory image. */ + + +/* Linux image notes for booting... The name for all of these is Linux */ + +#define LIN_COMMAND_LINE 0x00000001 +/* The command line to pass to the loaded kernel. */ +#define LIN_ROOT_DEV 0x00000002 +/* The root dev to pass to the loaded kernel. */ +#define LIN_RAMDISK_FLAGS 0x00000003 +/* Various old ramdisk flags */ +#define LIN_INITRD_START 0x00000004 +/* Start of the ramdisk in bytes */ +#define LIN_INITRD_SIZE 0x00000005 +/* Size of the ramdisk in bytes */ + +/* Notes that are passed to a loaded image */ +/* For the standard elf boot notes n_namesz must be zero */ +#define EBN_FIRMWARE_TYPE 0x00000001 +/* ASCIZ name of the platform firmware. */ +#define EBN_BOOTLOADER_NAME 0x00000002 +/* This specifies just the ASCIZ name of the bootloader */ +#define EBN_BOOTLOADER_VERSION 0x00000003 +/* This specifies the version of the bootloader as an ASCIZ string */ +#define EBN_COMMAND_LINE 0x00000004 +/* This specifies a command line that can be set by user interaction, + * and is provided as a free form ASCIZ string to the loaded image. + */ +#define EBN_NOP 0x00000005 +/* A note nop note has no meaning, useful for inserting explicit padding */ +#define EBN_LOADED_IMAGE 0x00000006 +/* An ASCIZ string naming the loaded image */ + + +/* Etherboot specific notes */ +#define EB_PARAM_NOTE "Etherboot" +#define EB_IA64_SYSTAB 0x00000001 +#define EB_IA64_MEMMAP 0x00000002 +#define EB_IA64_FPSWA 0x00000003 +#define EB_IA64_CONINFO 0x00000004 +#define EB_BOOTP_DATA 0x00000005 +#define EB_HEADER 0x00000006 +#define EB_IA64_IMAGE_HANDLE 0x00000007 +#define EB_I386_MEMMAP 0x00000008 + +extern const struct elf_image_note elf_image_notes; + +#endif /* ELF_BOOT_H */ Copied: trunk/openbios-devel/include/arch/common/xcoff.h (from r692, trunk/openbios-devel/include/openbios/xcoff.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/arch/common/xcoff.h Sun Mar 14 18:06:20 2010 (r694, copy of r692, trunk/openbios-devel/include/openbios/xcoff.h) @@ -0,0 +1,98 @@ +#ifndef XCOFF_H +#define XCOFF_H + +/* XCOFF executable loader */ + +typedef struct COFF_filehdr_t { + uint16_t f_magic; /* magic number */ + uint16_t f_nscns; /* number of sections */ + uint32_t f_timdat; /* time & date stamp */ + uint32_t f_symptr; /* file pointer to symtab */ + uint32_t f_nsyms; /* number of symtab entries */ + uint16_t f_opthdr; /* sizeof(optional hdr) */ + uint16_t f_flags; /* flags */ +} COFF_filehdr_t; + +/* IBM RS/6000 */ + +#define U802WRMAGIC 0x02DA /* writeable text segments **chh** */ +#define U802ROMAGIC 0x02DF /* readonly sharable text segments */ +#define U802TOCMAGIC 0x02E1 /* readonly text segments and TOC */ +#define U802TOMAGIC 0x01DF + +/* + * Bits for f_flags: + * + * F_RELFLG relocation info stripped from file + * F_EXEC file is executable (i.e. no unresolved external + * references) + * F_LNNO line numbers stripped from file + * F_LSYMS local symbols stripped from file + * F_MINMAL this is a minimal object file (".m") output of fextract + * F_UPDATE this is a fully bound update file, output of ogen + * F_SWABD this file has had its bytes swabbed (in names) + * F_AR16WR this file has the byte ordering of an AR16WR + * (e.g. 11/70) machine + * F_AR32WR this file has the byte ordering of an AR32WR machine + * (e.g. vax and iNTEL 386) + * F_AR32W this file has the byte ordering of an AR32W machine + * (e.g. 3b,maxi) + * F_PATCH file contains "patch" list in optional header + * F_NODF (minimal file only) no decision functions for + * replaced functions + */ + +#define COFF_F_RELFLG 0000001 +#define COFF_F_EXEC 0000002 +#define COFF_F_LNNO 0000004 +#define COFF_F_LSYMS 0000010 +#define COFF_F_MINMAL 0000020 +#define COFF_F_UPDATE 0000040 +#define COFF_F_SWABD 0000100 +#define COFF_F_AR16WR 0000200 +#define COFF_F_AR32WR 0000400 +#define COFF_F_AR32W 0001000 +#define COFF_F_PATCH 0002000 +#define COFF_F_NODF 0002000 + +typedef struct COFF_aouthdr_t { + uint16_t magic; /* type of file */ + uint16_t vstamp; /* version stamp */ + uint32_t tsize; /* text size in bytes, padded to FW bdry */ + uint32_t dsize; /* initialized data " " */ + uint32_t bsize; /* uninitialized data " " */ + uint32_t entry; /* entry pt. */ + uint32_t text_start; /* base of text used for this file */ + uint32_t data_start; /* base of data used for this file */ + uint32_t o_toc; /* address of TOC */ + uint16_t o_snentry; /* section number of entry point */ + uint16_t o_sntext; /* section number of .text section */ + uint16_t o_sndata; /* section number of .data section */ + uint16_t o_sntoc; /* section number of TOC */ + uint16_t o_snloader; /* section number of .loader section */ + uint16_t o_snbss; /* section number of .bss section */ + uint16_t o_algntext; /* .text alignment */ + uint16_t o_algndata; /* .data alignment */ + uint16_t o_modtype; /* module type (??) */ + uint16_t o_cputype; /* cpu type */ + uint32_t o_maxstack; /* max stack size (??) */ + uint32_t o_maxdata; /* max data size (??) */ + char o_resv2[12]; /* reserved */ +} COFF_aouthdr_t; + +#define AOUT_MAGIC 0x010b + +typedef struct COFF_scnhdr_t { + char s_name[8]; /* section name */ + uint32_t s_paddr; /* physical address, aliased s_nlib */ + uint32_t s_vaddr; /* virtual address */ + uint32_t s_size; /* section size */ + uint32_t s_scnptr; /* file ptr to raw data for section */ + uint32_t s_relptr; /* file ptr to relocation */ + uint32_t s_lnnoptr; /* file ptr to line numbers */ + uint16_t s_nreloc; /* number of relocation entries */ + uint16_t s_nlnno; /* number of line number entries */ + uint32_t s_flags; /* flags */ +} COFF_scnhdr_t; + +#endif /* XCOFF_H */ Modified: trunk/openbios-devel/include/libopenbios/elfload.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/elfload.h Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/include/libopenbios/elfload.h Sun Mar 14 18:06:20 2010 (r694) @@ -17,7 +17,7 @@ #ifndef _H_ELFLOAD #define _H_ELFLOAD -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" extern int is_elf( int fd, int offs ); Modified: trunk/openbios-devel/libopenbios/elf_info.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/libopenbios/elf_info.c Sun Mar 14 18:06:20 2010 (r694) @@ -1,6 +1,6 @@ /* Support for ELF Boot Proposal as a boot image */ #include "openbios/config.h" -#include "elf_boot.h" +#include "arch/common/elf_boot.h" #include "libopenbios/sys_info.h" #include "asm/io.h" #include "libopenbios/ipchecksum.h" Modified: trunk/openbios-devel/libopenbios/elfload.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 18:06:20 2010 (r694) @@ -33,7 +33,7 @@ #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "libc/diskio.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #define DEBUG 0 #define MAX_HEADERS 32 Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 18:06:20 2010 (r694) @@ -19,7 +19,7 @@ #include "packages.h" #include "libopenbios/ofmem.h" -#include "openbios/elf.h" +#include "arch/common/elf.h" #include "asm/elf.h" /* TODO: manage ELF notes section */ Modified: trunk/openbios-devel/packages/xcoff-loader.c ============================================================================== --- trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 17:09:44 2010 (r693) +++ trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 18:06:20 2010 (r694) @@ -19,7 +19,7 @@ #include "packages.h" #include "libopenbios/ofmem.h" -#include "openbios/xcoff.h" +#include "arch/common/xcoff.h" //#define DEBUG_XCOFF

1 0

[commit] r692 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 drivers include/drivers include/openbios packages
by repository service March 14, 2010

March 14, 2010

Author: mcayland Date: Sun Mar 14 16:19:41 2010 New Revision: 692 URL: http://tracker.coreboot.org/trac/openbios/changeset/692 Log: Move the driver header files into include/drivers to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/drivers/ trunk/openbios-devel/include/drivers/drivers.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/drivers.h trunk/openbios-devel/include/drivers/pci.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/pci.h Deleted: trunk/openbios-devel/include/openbios/drivers.h trunk/openbios-devel/include/openbios/pci.h Modified: trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/macio.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/pci_database.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 16:19:41 2010 (r692) @@ -13,7 +13,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:19:41 2010 (r692) @@ -22,9 +22,9 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "openbios/nvram.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "qemu/qemu.h" #include "libopenbios/ofmem.h" #include "openbios-version.h" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 16:19:41 2010 (r692) @@ -20,7 +20,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/string.h" #include "qemu/qemu.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 16:19:41 2010 (r692) @@ -20,7 +20,7 @@ #include "kernel/kernel.h" #include "openbios/nvram.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/vsprintf.h" #include "libc/string.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:19:41 2010 (r692) @@ -6,7 +6,7 @@ #include "libopenbios/bindings.h" #include "libopenbios/elfload.h" #include "openbios/nvram.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 16:19:41 2010 (r692) @@ -7,7 +7,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "openbios.h" #include "video_subr.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "asm/types.h" #include "dict.h" #include "kernel/kernel.h" Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:19:41 2010 (r692) @@ -10,7 +10,7 @@ #include "openprom.h" #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libopenbios/fontdata.h" #include "openbios.h" #include "video_subr.h" Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,12 +8,12 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "dict.h" #include "openbios/nvram.h" #include "sys_info.h" #include "openbios.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "asm/pci.h" #include "boot.h" #include "../../drivers/timer.h" // XXX Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:19:41 2010 (r692) @@ -12,8 +12,8 @@ #include "dict.h" #include "kernel/kernel.h" #include "kernel/stack.h" -#include "openbios/drivers.h" -#include "openbios/pci.h" +#include "drivers/drivers.h" +#include "drivers/pci.h" #include "sys_info.h" #include "openbios.h" #include "relocate.h" Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/cuda.c Sun Mar 14 16:19:41 2010 (r692) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/escc.c Sun Mar 14 16:19:41 2010 (r692) @@ -2,7 +2,7 @@ #include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libopenbios/ofmem.h" #include "escc.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 16:19:41 2010 (r692) @@ -19,7 +19,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "asm/io.h" #include "scsi.h" #include "asm/dma.h" Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 16:19:41 2010 (r692) @@ -4,7 +4,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "timer.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 16:19:41 2010 (r692) @@ -19,7 +19,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "ide.h" #include "hdreg.h" #include "timer.h" Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/iommu.c Sun Mar 14 16:19:41 2010 (r692) @@ -6,7 +6,7 @@ **/ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "iommu.h" #include "libopenbios/ofmem.h" Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 16:19:41 2010 (r692) @@ -14,11 +14,11 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "macio.h" #include "cuda.h" #include "escc.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #define OW_IO_NVRAM_SIZE 0x00020000 #define OW_IO_NVRAM_OFFSET 0x00060000 Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:19:41 2010 (r692) @@ -16,7 +16,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "openbios/nvram.h" #include "libopenbios/ofmem.h" #include "obio.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/vsprintf.h" /* ****************************************************************** Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 16:19:41 2010 (r692) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libc/vsprintf.h" /* ****************************************************************** Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 16:19:41 2010 (r692) @@ -18,11 +18,11 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" #include "kernel/kernel.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "video_subr.h" #include "timer.h" #include "pci.h" Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 16:19:41 2010 (r692) @@ -1,6 +1,6 @@ #include "openbios/config.h" #include "libopenbios/bindings.h" -#include "openbios/pci.h" +#include "drivers/pci.h" #include "libc/vsprintf.h" #include "pci_database.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 16:19:41 2010 (r692) @@ -15,7 +15,7 @@ #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "libopenbios/ofmem.h" #define SBUS_REGS 0x28 Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 16:19:41 2010 (r692) @@ -19,8 +19,8 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" -#include "openbios/pci.h" -#include "openbios/drivers.h" +#include "drivers/pci.h" +#include "drivers/drivers.h" #include "libopenbios/fontdata.h" #include "asm/io.h" #include "libc/vsprintf.h" Copied: trunk/openbios-devel/include/drivers/drivers.h (from r689, trunk/openbios-devel/include/openbios/drivers.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/drivers/drivers.h Sun Mar 14 16:19:41 2010 (r692, copy of r689, trunk/openbios-devel/include/openbios/drivers.h) @@ -0,0 +1,127 @@ +/* + * OpenBIOS driver prototypes + * + * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ +#ifndef OPENBIOS_DRIVERS_H +#define OPENBIOS_DRIVERS_H + +#include "openbios/config.h" + +#ifdef CONFIG_DRIVER_PCI +/* drivers/pci.c */ +int ob_pci_init(void); +#endif + +#if defined(CONFIG_DRIVER_PCI) || defined(CONFIG_DRIVER_ESCC) +#ifdef CONFIG_PPC +extern int is_apple(void); +extern int is_oldworld(void); +extern int is_newworld(void); +#else +static inline int is_apple(void) +{ + return 0; +} +static inline int is_oldworld(void) +{ + return 0; +} +static inline int is_newworld(void) +{ + return 0; +} +#endif +#define AAPL(_cmd) do { if (is_apple()) _cmd; } while(0) +#define OLDWORLD(_cmd) do { if (is_oldworld()) _cmd; } while(0) +#define NEWWORLD(_cmd) do { if (is_newworld()) _cmd; } while(0) +#endif +#ifdef CONFIG_DRIVER_SBUS +/* drivers/sbus.c */ +int ob_sbus_init(uint64_t base, int machine_id); + +/* arch/sparc32/console.c */ +void tcx_init(uint64_t base); +void kbd_init(uint64_t base); +#endif +#ifdef CONFIG_DRIVER_IDE +/* drivers/ide.c */ +int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, + uint32_t io_port1, uint32_t ctl_port1); +int macio_ide_init(const char *path, uint32_t addr, int nb_channels); +#endif +#ifdef CONFIG_DRIVER_ESP +/* drivers/esp.c */ +int ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset, + unsigned long dmaoffset); +#endif +#ifdef CONFIG_DRIVER_OBIO +/* drivers/obio.c */ +int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, + unsigned long counter_offset, unsigned long intr_offset, + unsigned long aux1_offset, unsigned long aux2_offset); +int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, + int cpu); + +/* drivers/iommu.c */ +void ob_init_iommu(uint64_t base); +void *dvma_alloc(int size, unsigned int *pphys); + +/* drivers/sbus.c */ +extern uint16_t graphic_depth; + +/* drivers/obio.c */ +extern volatile unsigned char *power_reg; +extern volatile unsigned int *reset_reg; +extern volatile struct sun4m_timer_regs *counter_regs; + +void ob_new_obio_device(const char *name, const char *type); +unsigned long ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map); +void ob_intr(int intr); + +/* arch/sparc32/romvec.c */ +extern const char *obp_stdin_path, *obp_stdout_path; +extern char obp_stdin, obp_stdout; + +/* arch/sparc32/boot.c */ +extern uint32_t kernel_image; +extern uint32_t kernel_size; +extern uint32_t qemu_cmdline; +extern uint32_t cmdline_size; +extern char boot_device; +#endif +#ifdef CONFIG_DRIVER_FLOPPY +int ob_floppy_init(const char *path, const char *dev_name, + unsigned long io_base, unsigned long mmio_base); +#endif +#ifdef CONFIG_DRIVER_PC_KBD +void ob_pc_kbd_init(const char *path, const char *dev_name, uint64_t base, + uint64_t offset, int intr); +int pc_kbd_dataready(void); +unsigned char pc_kbd_readdata(void); +#endif +#ifdef CONFIG_DRIVER_PC_SERIAL +void ob_pc_serial_init(const char *path, const char *dev_name, uint64_t base, + uint64_t offset, int intr); +int uart_init(int port, unsigned long speed); +int uart_charav(int port); +char uart_getchar(int port); +void serial_putchar(int c); +#endif +#ifdef CONFIG_DRIVER_ESCC +int uart_init(uint64_t port, unsigned long speed); +int uart_charav(int port); +char uart_getchar(int port); +void serial_putchar(int c); +void serial_cls(void); +#ifdef CONFIG_DRIVER_ESCC_SUN +int keyboard_dataready(void); +unsigned char keyboard_readdata(void); +#endif +#endif +#endif /* OPENBIOS_DRIVERS_H */ Copied: trunk/openbios-devel/include/drivers/pci.h (from r689, trunk/openbios-devel/include/openbios/pci.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/drivers/pci.h Sun Mar 14 16:19:41 2010 (r692, copy of r689, trunk/openbios-devel/include/openbios/pci.h) @@ -0,0 +1,210 @@ +#ifndef _H_PCI +#define _H_PCI + +typedef uint32_t pci_addr; + +typedef struct pci_arch_t pci_arch_t; + +struct pci_arch_t { + const char * name; + uint16_t vendor_id; + uint16_t device_id; + unsigned long cfg_addr; + unsigned long cfg_data; + unsigned long cfg_base; + unsigned long cfg_len; + unsigned long mem_base; + unsigned long mem_len; + unsigned long io_base; + unsigned long io_len; + unsigned long rbase; + unsigned long rlen; + uint8_t irqs[4]; +}; + +extern const pci_arch_t *arch; + +/* Device tree offsets */ + +#define PCI_INT_MAP_PCI0 0 +#define PCI_INT_MAP_PCI1 1 +#define PCI_INT_MAP_PCI2 2 +#define PCI_INT_MAP_PCI_INT 3 +#define PCI_INT_MAP_PIC_HANDLE 4 +#define PCI_INT_MAP_PIC_INT 5 +#define PCI_INT_MAP_PIC_POL 6 + +/* Device classes and subclasses */ + +#define PCI_BASE_CLASS_STORAGE 0x01 +#define PCI_SUBCLASS_STORAGE_SCSI 0x00 +#define PCI_SUBCLASS_STORAGE_IDE 0x01 +#define PCI_SUBCLASS_STORAGE_FLOPPY 0x02 +#define PCI_SUBCLASS_STORAGE_IPI 0x03 +#define PCI_SUBCLASS_STORAGE_RAID 0x04 +#define PCI_SUBCLASS_STORAGE_ATA 0x05 +#define PCI_SUBCLASS_STORAGE_SAS 0x07 +#define PCI_SUBCLASS_STORAGE_OTHER 0x80 + +#define PCI_BASE_CLASS_NETWORK 0x02 +#define PCI_SUBCLASS_NETWORK_ETHERNET 0x00 +#define PCI_SUBCLASS_NETWORK_TOKEN_RING 0x01 +#define PCI_SUBCLASS_NETWORK_FDDI 0x02 +#define PCI_SUBCLASS_NETWORK_ATM 0x03 +#define PCI_SUBCLASS_NETWORK_ISDN 0x04 +#define PCI_SUBCLASS_NETWORK_WORDFIP 0x05 +#define PCI_SUBCLASS_NETWORK_PICMG214 0x06 +#define PCI_SUBCLASS_NETWORK_OTHER 0x80 + +#define PCI_BASE_CLASS_DISPLAY 0x03 +#define PCI_SUBCLASS_DISPLAY_VGA 0x00 +#define PCI_SUBCLASS_DISPLAY_XGA 0x01 +#define PCI_SUBCLASS_DISPLAY_3D 0x02 +#define PCI_SUBCLASS_DISPLAY_OTHER 0x80 + +#define PCI_BASE_CLASS_MULTIMEDIA 0x04 +#define PCI_SUBCLASS_MULTIMEDIA_VIDEO 0x00 +#define PCI_SUBCLASS_MULTIMEDIA_AUDIO 0x01 +#define PCI_SUBCLASS_MULTIMEDIA_PHONE 0x02 +#define PCI_SUBCLASS_MULTIMEDIA_OTHER 0x80 + +#define PCI_BASE_CLASS_MEMORY 0x05 +#define PCI_SUBCLASS_MEMORY_RAM 0x00 +#define PCI_SUBCLASS_MEMORY_FLASH 0x01 + +#define PCI_BASE_CLASS_BRIDGE 0x06 +#define PCI_SUBCLASS_BRIDGE_HOST 0x00 +#define PCI_SUBCLASS_BRIDGE_ISA 0x01 +#define PCI_SUBCLASS_BRIDGE_EISA 0x02 +#define PCI_SUBCLASS_BRIDGE_MC 0x03 +#define PCI_SUBCLASS_BRIDGE_PCI 0x04 +#define PCI_SUBCLASS_BRIDGE_PCMCIA 0x05 +#define PCI_SUBCLASS_BRIDGE_NUBUS 0x06 +#define PCI_SUBCLASS_BRIDGE_CARDBUS 0x07 +#define PCI_SUBCLASS_BRIDGE_RACEWAY 0x08 +#define PCI_SUBCLASS_BRIDGE_PCI_SEMITP 0x09 +#define PCI_SUBCLASS_BRIDGE_IB_PCI 0x0a +#define PCI_SUBCLASS_BRIDGE_OTHER 0x80 + +#define PCI_BASE_CLASS_COMMUNICATION 0x07 +#define PCI_SUBCLASS_COMMUNICATION_SERIAL 0x00 +#define PCI_SUBCLASS_COMMUNICATION_PARALLEL 0x01 +#define PCI_SUBCLASS_COMMUNICATION_MULTISERIAL 0x02 +#define PCI_SUBCLASS_COMMUNICATION_MODEM 0x03 +#define PCI_SUBCLASS_COMMUNICATION_GPIB 0x04 +#define PCI_SUBCLASS_COMMUNICATION_SC 0x05 +#define PCI_SUBCLASS_COMMUNICATION_OTHER 0x80 + +#define PCI_BASE_CLASS_SYSTEM 0x08 +#define PCI_SUBCLASS_SYSTEM_PIC 0x00 +#define PCI_SUBCLASS_SYSTEM_DMA 0x01 +#define PCI_SUBCLASS_SYSTEM_TIMER 0x02 +#define PCI_SUBCLASS_SYSTEM_RTC 0x03 +#define PCI_SUBCLASS_SYSTEM_PCI_HOTPLUG 0x04 +#define PCI_SUBCLASS_SYSTEM_OTHER 0x80 + +#define PCI_BASE_CLASS_INPUT 0x09 +#define PCI_SUBCLASS_INPUT_KEYBOARD 0x00 +#define PCI_SUBCLASS_INPUT_PEN 0x01 +#define PCI_SUBCLASS_INPUT_MOUSE 0x02 +#define PCI_SUBCLASS_INPUT_SCANNER 0x03 +#define PCI_SUBCLASS_INPUT_GAMEPORT 0x04 +#define PCI_SUBCLASS_INPUT_OTHER 0x80 + +#define PCI_BASE_CLASS_DOCKING 0x0a +#define PCI_SUBCLASS_DOCKING_GENERIC 0x00 +#define PCI_SUBCLASS_DOCKING_OTHER 0x80 + +#define PCI_BASE_CLASS_PROCESSOR 0x0b +#define PCI_SUBCLASS_PROCESSOR_386 0x00 +#define PCI_SUBCLASS_PROCESSOR_486 0x01 +#define PCI_SUBCLASS_PROCESSOR_PENTIUM 0x02 +#define PCI_SUBCLASS_PROCESSOR_ALPHA 0x10 +#define PCI_SUBCLASS_PROCESSOR_POWERPC 0x20 +#define PCI_SUBCLASS_PROCESSOR_MIPS 0x30 +#define PCI_SUBCLASS_PROCESSOR_CO 0x40 + +#define PCI_BASE_CLASS_SERIAL 0x0c +#define PCI_SUBCLASS_SERIAL_FIREWIRE 0x00 +#define PCI_SUBCLASS_SERIAL_ACCESS 0x01 +#define PCI_SUBCLASS_SERIAL_SSA 0x02 +#define PCI_SUBCLASS_SERIAL_USB 0x03 +#define PCI_SUBCLASS_SERIAL_FIBER 0x04 +#define PCI_SUBCLASS_SERIAL_SMBUS 0x05 +#define PCI_SUBCLASS_SERIAL_IB 0x06 +#define PCI_SUBCLASS_SERIAL_IPMI 0x07 +#define PCI_SUBCLASS_SERIAL_SERCOS 0x08 +#define PCI_SUBCLASS_SERIAL_CANBUS 0x09 + +#define PCI_BASE_CLASS_WIRELESS 0x0d +#define PCI_SUBCLASS_WIRELESS_IRDA 0x00 +#define PCI_SUBCLASS_WIRELESS_CIR 0x01 +#define PCI_SUBCLASS_WIRELESS_RF_CONTROLLER 0x10 +#define PCI_SUBCLASS_WIRELESS_BLUETOOTH 0x11 +#define PCI_SUBCLASS_WIRELESS_BROADBAND 0x12 +#define PCI_SUBCLASS_WIRELESS_OTHER 0x80 + +#define PCI_BASE_CLASS_SATELLITE 0x0f +#define PCI_SUBCLASS_SATELLITE_TV 0x00 +#define PCI_SUBCLASS_SATELLITE_AUDIO 0x01 +#define PCI_SUBCLASS_SATELLITE_VOICE 0x03 +#define PCI_SUBCLASS_SATELLITE_DATA 0x04 + +#define PCI_BASE_CLASS_CRYPT 0x10 +#define PCI_SUBCLASS_CRYPT_NETWORK 0x00 +#define PCI_SUBCLASS_CRYPT_ENTERTAINMENT 0x01 +#define PCI_SUBCLASS_CRYPT_OTHER 0x80 + +#define PCI_BASE_CLASS_SIGNAL_PROCESSING 0x11 +#define PCI_SUBCLASS_SP_DPIO 0x00 +#define PCI_SUBCLASS_SP_PERF 0x01 +#define PCI_SUBCLASS_SP_SYNCH 0x10 +#define PCI_SUBCLASS_SP_MANAGEMENT 0x20 +#define PCI_SUBCLASS_SP_OTHER 0x80 + +#define PCI_CLASS_OTHERS 0xff + +/* Vendors and devices. */ + +#define PCI_VENDOR_ID_ATI 0x1002 +#define PCI_DEVICE_ID_ATI_RAGE128_PF 0x5046 + +#define PCI_VENDOR_ID_DEC 0x1011 +#define PCI_DEVICE_ID_DEC_21154 0x0026 + +#define PCI_VENDOR_ID_IBM 0x1014 +#define PCI_DEVICE_ID_IBM_OPENPIC 0x0002 +#define PCI_DEVICE_ID_IBM_OPENPIC2 0xffff + +#define PCI_VENDOR_ID_MOTOROLA 0x1057 +#define PCI_DEVICE_ID_MOTOROLA_MPC106 0x0002 +#define PCI_DEVICE_ID_MOTOROLA_RAVEN 0x4801 + +#define PCI_VENDOR_ID_APPLE 0x106b +#define PCI_DEVICE_ID_APPLE_343S1201 0x0010 +#define PCI_DEVICE_ID_APPLE_343S1211 0x0017 +#define PCI_DEVICE_ID_APPLE_UNI_N_I_PCI 0x001e +#define PCI_DEVICE_ID_APPLE_UNI_N_PCI 0x001f +#define PCI_DEVICE_ID_APPLE_UNI_N_AGP 0x0020 +#define PCI_DEVICE_ID_APPLE_UNI_N_KEYL 0x0022 +#define PCI_DEVICE_ID_APPLE_U3_AGP 0x004b + +#define PCI_VENDOR_ID_SUN 0x108e +#define PCI_DEVICE_ID_SUN_EBUS 0x1000 +#define PCI_DEVICE_ID_SUN_SIMBA 0x5000 +#define PCI_DEVICE_ID_SUN_PBM 0x8000 +#define PCI_DEVICE_ID_SUN_SABRE 0xa000 + +#define PCI_VENDOR_ID_CMD 0x1095 +#define PCI_DEVICE_ID_CMD_646 0x0646 + +#define PCI_VENDOR_ID_REALTEK 0x10ec +#define PCI_DEVICE_ID_REALTEK_RTL8029 0x8029 + +#define PCI_VENDOR_ID_QEMU 0x1234 +#define PCI_DEVICE_ID_QEMU_VGA 0x1111 + +#define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_DEVICE_ID_INTEL_82441 0x1237 + +#endif /* _H_PCI */ Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 16:05:53 2010 (r691) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 16:19:41 2010 (r692) @@ -18,7 +18,7 @@ #include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libopenbios/ofmem.h" -#include "openbios/drivers.h" +#include "drivers/drivers.h" #include "video_subr.h" typedef struct osi_fb_info {

1 0

[commit] r691 - 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 arch/x86/xbox drivers fs fs/ext2 f...
by repository service March 14, 2010

March 14, 2010

Author: mcayland Date: Sun Mar 14 16:05:53 2010 New Revision: 691 URL: http://tracker.coreboot.org/trac/openbios/changeset/691 Log: Move the libopenbios header files into include/libopenbios to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/libopenbios/ trunk/openbios-devel/include/libopenbios/bindings.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/bindings.h trunk/openbios-devel/include/libopenbios/elfload.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/elfload.h trunk/openbios-devel/include/libopenbios/fontdata.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/fontdata.h trunk/openbios-devel/include/libopenbios/ipchecksum.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/ipchecksum.h trunk/openbios-devel/include/libopenbios/of.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/of.h trunk/openbios-devel/include/libopenbios/ofmem.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/ofmem.h Deleted: trunk/openbios-devel/include/ipchecksum.h trunk/openbios-devel/include/ofmem.h trunk/openbios-devel/include/openbios/bindings.h trunk/openbios-devel/include/openbios/elfload.h trunk/openbios-devel/include/openbios/fontdata.h trunk/openbios-devel/include/openbios/of.h Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/amd64/elfload.c trunk/openbios-devel/arch/amd64/linux_load.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/briq/main.c trunk/openbios-devel/arch/ppc/briq/methods.c trunk/openbios-devel/arch/ppc/briq/tree.c trunk/openbios-devel/arch/ppc/briq/vfd.c trunk/openbios-devel/arch/ppc/kernel.c trunk/openbios-devel/arch/ppc/mol/console.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/mol/main.c trunk/openbios-devel/arch/ppc/mol/methods.c trunk/openbios-devel/arch/ppc/mol/osi-blk.c trunk/openbios-devel/arch/ppc/mol/osi-scsi.c trunk/openbios-devel/arch/ppc/mol/pseudodisk.c trunk/openbios-devel/arch/ppc/mol/tree.c trunk/openbios-devel/arch/ppc/ofmem.c trunk/openbios-devel/arch/ppc/pearpc/console.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/pearpc/main.c trunk/openbios-devel/arch/ppc/pearpc/methods.c trunk/openbios-devel/arch/ppc/pearpc/tree.c trunk/openbios-devel/arch/ppc/pearpc/vfd.c trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/arch/ppc/qemu/vfd.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/elfload.c trunk/openbios-devel/arch/sparc32/forthload.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/console.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/lib.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/unix/blk.c trunk/openbios-devel/arch/unix/boot.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/exception.c trunk/openbios-devel/arch/x86/forthload.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/xbox/console.c trunk/openbios-devel/arch/x86/xbox/methods.c trunk/openbios-devel/drivers/adb_bus.c trunk/openbios-devel/drivers/adb_kbd.c trunk/openbios-devel/drivers/adb_mouse.c trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/macio.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/pci_database.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/fs/ext2/ext2_utils.c trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/iso9660/iso9660_mount.c trunk/openbios-devel/fs/iso9660/iso9660_read.c trunk/openbios-devel/fs/iso9660/iso9660_readdir.c trunk/openbios-devel/libc/diskio.c trunk/openbios-devel/libc/extra.c trunk/openbios-devel/libopenbios/bindings.c trunk/openbios-devel/libopenbios/client.c trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/libopenbios/elfload.c trunk/openbios-devel/libopenbios/elfnote.c trunk/openbios-devel/libopenbios/font_8x16.c trunk/openbios-devel/libopenbios/font_8x8.c trunk/openbios-devel/libopenbios/ipchecksum.c trunk/openbios-devel/libopenbios/linuxbios.c trunk/openbios-devel/libopenbios/ofmem_common.c trunk/openbios-devel/packages/bootinfo-loader.c trunk/openbios-devel/packages/cmdline.c trunk/openbios-devel/packages/deblocker.c trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/elf-loader.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/nvram.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c trunk/openbios-devel/packages/video.c trunk/openbios-devel/packages/xcoff-loader.c Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/amd64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #define printf printk #define debug printk Modified: trunk/openbios-devel/arch/amd64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "segment.h" Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" #include "kernel/kernel.h" Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,10 +20,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "briq/briq.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios-version.h" extern void unexpected_excep( int vector ); Modified: trunk/openbios-devel/arch/ppc/briq/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -17,13 +17,13 @@ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "briq/briq.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" static void transfer_control_to_elf( ulong entry ) Modified: trunk/openbios-devel/arch/ppc/briq/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,10 +19,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "briq/briq.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" /************************************************************************/ /* RTAS (run-time abstraction services) */ Modified: trunk/openbios-devel/arch/ppc/briq/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/tree.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" void devtree_init( void ) { Modified: trunk/openbios-devel/arch/ppc/briq/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/briq/vfd.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "briq/briq.h" static int vfd_is_open; Modified: trunk/openbios-devel/arch/ppc/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/kernel.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,7 +19,7 @@ #include "openbios/config.h" #include "dict.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/stack.h" #include "kernel/kernel.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/mol/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,10 +16,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "osi_calls.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/mol.h" #include "boothelper_sh.h" #include "video_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,10 +16,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "mol/mol.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/prom.h" #include "openbios-version.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,13 +16,13 @@ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "mol/mol.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "osi_calls.h" #include "ablk_sh.h" #include "boothelper_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,10 +15,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "mol/mol.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/prom.h" #include "osi_calls.h" #include "kbd_sh.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-blk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/osi-blk.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mol/mol.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/osi-scsi.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mol/mol.h" #include "scsi_sh.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/pseudodisk.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/pseudodisk.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,10 +15,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "osi_calls.h" #include "libc/string.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "mol/prom.h" #include "mol/mol.h" #include "osi_calls.h" Modified: trunk/openbios-devel/arch/ppc/mol/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/mol/tree.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mol/mol.h" #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/ofmem.c Sun Mar 14 16:05:53 2010 (r691) @@ -18,9 +18,9 @@ /* TODO: Clean up MOLisms in a decent way */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "kernel.h" #ifdef I_WANT_MOLISMS #include "mol/prom.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,9 +13,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "pearpc/pearpc.h" Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -21,10 +21,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #include "pearpc/pearpc.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios-version.h" extern void unexpected_excep( int vector ); Modified: trunk/openbios-devel/arch/ppc/pearpc/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -17,13 +17,13 @@ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "pearpc/pearpc.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" static void transfer_control_to_elf( ulong entry ) Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,10 +19,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "pearpc/pearpc.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" /************************************************************************/ /* RTAS (run-time abstraction services) */ Modified: trunk/openbios-devel/arch/ppc/pearpc/tree.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/tree.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" void devtree_init( void ) { Modified: trunk/openbios-devel/arch/ppc/pearpc/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/pearpc/vfd.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "pearpc/pearpc.h" static int vfd_is_open; Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -12,7 +12,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 16:05:53 2010 (r691) @@ -21,12 +21,12 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/pci.h" #include "openbios/nvram.h" #include "openbios/drivers.h" #include "qemu/qemu.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios-version.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ #include "qemu-dict.h" #include "openbios/config.h" #include "dict.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/stack.h" #include "kernel/kernel.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,13 +15,13 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "kernel.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,11 +19,11 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "libc/string.h" #include "qemu/qemu.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "arch/ppc/processor.h" /************************************************************************/ Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,9 +16,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "kernel.h" #include "mmutypes.h" #include "asm/processor.h" Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,7 +19,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" #include "openbios/nvram.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "libc/vsprintf.h" #include "libc/string.h" Modified: trunk/openbios-devel/arch/ppc/qemu/vfd.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/ppc/qemu/vfd.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "qemu/qemu.h" static int vfd_is_open; Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "openbios/drivers.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/drivers.h" #include "openbios.h" #include "video_subr.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/sparc32/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc32/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/forthload.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,8 +8,8 @@ */ #include "libc/vsprintf.h" -#include "openbios/bindings.h" -#include "ofmem.h" +#include "libopenbios/bindings.h" +#include "libopenbios/ofmem.h" #include "asm/asi.h" #include "pgtsrmmu.h" #include "openprom.h" Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "asm/types.h" #include "dict.h" Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "openprom.h" #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -6,10 +6,10 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "openbios/drivers.h" -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" #include "openbios.h" #include "video_subr.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/arch/sparc64/elfload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" #define printf printk Modified: trunk/openbios-devel/arch/sparc64/fcodeload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/fcodeload.c Sun Mar 14 16:05:53 2010 (r691) @@ -4,7 +4,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/forthload.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/forthload.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "openbios/config.h" #include "libc/vsprintf.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "spitfire.h" #include "sys_info.h" #include "boot.h" Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "loadfs.h" Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,7 +13,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "ofmem_sparc64.h" #include "spitfire.h" Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h Sun Mar 14 16:05:53 2010 (r691) @@ -14,7 +14,7 @@ #ifndef _H_OFMEM_SPARC64 #define _H_OFMEM_SPARC64 -#include "ofmem.h" +#include "libopenbios/ofmem.h" extern void ofmem_map_pages(ucell phys, ucell virt, ucell size, ucell mode); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "dict.h" #include "openbios/nvram.h" @@ -20,7 +20,7 @@ #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" #include "video_subr.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/arch/unix/blk.c ============================================================================== --- trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/unix/blk.c Sun Mar 14 16:05:53 2010 (r691) @@ -12,7 +12,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "blk.h" typedef struct { Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/unix/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,8 +3,8 @@ */ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 16:05:53 2010 (r691) @@ -31,11 +31,11 @@ #include "dict.h" #include "kernel/stack.h" #include "arch/unix/plugins.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios-version.h" #include "blk.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define MEMORY_SIZE (4*1024*1024) /* 4M ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256k for the dictionary */ Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/boot.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,8 +8,8 @@ #undef BOOTSTRAP #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" #include "sys_info.h" Modified: trunk/openbios-devel/arch/x86/elfload.c ============================================================================== --- trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ #include "asm/elf.h" #include "elf_boot.h" #include "sys_info.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/exception.c ============================================================================== --- trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/exception.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "asm/types.h" Modified: trunk/openbios-devel/arch/x86/forthload.c ============================================================================== --- trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/forthload.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "loadfs.h" #include "boot.h" Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "sys_info.h" #include "context.h" #include "segment.h" Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "asm/types.h" #include "dict.h" #include "kernel/kernel.h" Modified: trunk/openbios-devel/arch/x86/xbox/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/xbox/console.c Sun Mar 14 16:05:53 2010 (r691) @@ -11,7 +11,7 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" typedef struct osi_fb_info { Modified: trunk/openbios-devel/arch/x86/xbox/methods.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/arch/x86/xbox/methods.c Sun Mar 14 16:05:53 2010 (r691) @@ -19,9 +19,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" -// #include "ofmem.h" +// #include "libopenbios/ofmem.h" /************************************************************************/ /* stdout */ Modified: trunk/openbios-devel/drivers/adb_bus.c ============================================================================== --- trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/adb_bus.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/vsprintf.h" #include "adb_bus.h" Modified: trunk/openbios-devel/drivers/adb_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/adb_kbd.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "kbd.h" Modified: trunk/openbios-devel/drivers/adb_mouse.c ============================================================================== --- trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/adb_mouse.c Sun Mar 14 16:05:53 2010 (r691) @@ -20,7 +20,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/cuda.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/escc.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,9 +1,9 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "escc.h" Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/esp.c Sun Mar 14 16:05:53 2010 (r691) @@ -14,7 +14,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" @@ -24,7 +24,7 @@ #include "scsi.h" #include "asm/dma.h" #include "esp.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define BUFSIZE 4096 Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/floppy.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,7 +1,7 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/ide.c Sun Mar 14 16:05:53 2010 (r691) @@ -14,7 +14,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/iommu.c Sun Mar 14 16:05:53 2010 (r691) @@ -5,10 +5,10 @@ ** This code is licensed under GNU General Public License. **/ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/drivers.h" #include "iommu.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #ifdef CONFIG_DEBUG_IOMMU #define DPRINTF(fmt, args...) \ Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/macio.c Sun Mar 14 16:05:53 2010 (r691) @@ -10,7 +10,7 @@ #include "openbios/config.h" #include "openbios/nvram.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.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 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/obio.c Sun Mar 14 16:05:53 2010 (r691) @@ -11,14 +11,14 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" #include "openbios/nvram.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "obio.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Mar 14 16:05:53 2010 (r691) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.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 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Mar 14 16:05:53 2010 (r691) @@ -6,7 +6,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.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 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pci.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,7 +16,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "openbios/pci.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/pci_database.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,5 +1,5 @@ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/pci.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/sbus.c Sun Mar 14 16:05:53 2010 (r691) @@ -11,12 +11,12 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "kernel/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #define SBUS_REGS 0x28 #define SBUS_SLOTS 16 Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/drivers/vga_vbe.c Sun Mar 14 16:05:53 2010 (r691) @@ -18,14 +18,14 @@ #include "openbios/config.h" #include "kernel/kernel.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/pci.h" #include "openbios/drivers.h" -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" #include "asm/io.h" #include "libc/vsprintf.h" #include "video_subr.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" /* VGA init. We use the Bochs VESA VBE extensions */ #define VBE_DISPI_INDEX_ID 0x0 Modified: trunk/openbios-devel/fs/ext2/ext2_utils.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/ext2/ext2_utils.c Sun Mar 14 16:05:53 2010 (r691) @@ -8,7 +8,7 @@ #include "libext2.h" #include "ext2_utils.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "filesys.h" #include "glue.h" Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/ioglue.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" #include "os.h" Modified: trunk/openbios-devel/fs/iso9660/iso9660_mount.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Mar 14 16:05:53 2010 (r691) @@ -9,7 +9,7 @@ */ #include "libiso9660.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record *idr, char *buffer) Modified: trunk/openbios-devel/fs/iso9660/iso9660_read.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_read.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/iso9660/iso9660_read.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "libiso9660.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" size_t iso9660_read(iso9660_FILE *_file, char *buf, size_t count) Modified: trunk/openbios-devel/fs/iso9660/iso9660_readdir.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_readdir.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/fs/iso9660/iso9660_readdir.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ */ #include "libiso9660.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #define offsetof(t,m) ((long)&(((t *)0)->m)) Copied: trunk/openbios-devel/include/libopenbios/bindings.h (from r689, trunk/openbios-devel/include/openbios/bindings.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/bindings.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/bindings.h) @@ -0,0 +1,150 @@ +/* + * Creation Date: <2003/12/19 23:09:56 samuel> + * Time-stamp: <2004/01/07 19:36:42 samuel> + * + * <bindings.h> + * + * Forth bindings + * + * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#ifndef _H_BINDINGS +#define _H_BINDINGS + +#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) +#define RET( v ) do { PUSH(v); return; } while(0) + +/* initialization */ +extern int initialize_forth( void ); + +/* panic */ +extern int forth_segv_handler( char *segv_addr ); + +/* active package */ +extern phandle_t find_dev( const char *path ); +extern phandle_t get_cur_dev( void ); +extern phandle_t activate_device( const char *str ); +extern void device_end( void ); +extern void activate_dev( phandle_t ph ); + + +/* ihandle related */ +extern phandle_t ih_to_phandle( ihandle_t ih ); +extern ihandle_t my_parent( void ); +extern ihandle_t my_self( void ); +extern char *my_args_copy( void ); + +extern xt_t find_package_method( const char *meth, phandle_t ph ); +extern xt_t find_ih_method( const char *method, ihandle_t ih ); +extern xt_t find_parent_method( const char *method ); +extern void call_package( xt_t xt, ihandle_t ihandle ); +extern void call_parent( xt_t xt ); +extern void call_parent_method( const char *method ); + +/* package */ +extern ihandle_t open_package( const char *argstr, phandle_t ph ); +extern ihandle_t open_dev( const char *spec ); +extern void close_package( ihandle_t ih ); +extern void close_dev( ihandle_t ih ); + +/* property access */ +extern void set_property( phandle_t ph, const char *name, + const char *buf, int len ); +extern void set_int_property( phandle_t ph, const char *name, + u32 val ); +extern u32 get_int_property( phandle_t ph, const char *name, + int *retlen ); +extern char *get_property( phandle_t ph, const char *name, + int *retlen ); + +/* device tree iteration */ +extern phandle_t dt_iter_begin( void ); +extern phandle_t dt_iterate( phandle_t last_tree ); +extern phandle_t dt_iterate_type( phandle_t last_tree, + const char *type ); +static inline phandle_t dt_find_type( const char *type ) { + return dt_iterate_type( 0, type ); +} + +/* forth bindings */ +extern cell feval( const char *str ); +extern void bind_xtfunc( const char *name, xt_t xt, + ucell arg, void (*func)(void) ); +extern void bind_func( const char *name, void (*func)(void) ); +extern xt_t bind_noname_func( void (*func)(void) ); +extern void push_str( const char *str ); +extern char *pop_fstr_copy( void ); + +extern int _fword( const char *word, xt_t *cache_xt ); +extern cell _eword( const char *word, xt_t *cache_xt, int nargs ); +extern int _selfword( const char *method, xt_t *cache_xt ); +extern int _parword( const char *method, xt_t *cache_xt ); + +#define fword(w) ({ static xt_t cache_xt = 0; _fword(w, &cache_xt); }) +#define eword(w, nargs) ({ static xt_t cache_xt = 0; _eword(w, &cache_xt, nargs); }) +#define selfword(w) ({ static xt_t cache_xt = 0; _selfword(w, &cache_xt); }) +#define parword(w) ({ static xt_t cache_xt = 0; _parword(w, &cache_xt); }) + +extern void throw( int error ); + + +/* node bindings */ +extern void make_openable( int only_parents ); + + +typedef struct { + const char *name; + void *func; +} method_t; + +#define REGISTER_NAMED_NODE( name, path ) do { \ + bind_new_node( name##_flags_, name##_size_, \ + path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + +#define REGISTER_NODE_METHODS( name, path ) do { \ + const char *paths[1]; \ + \ + paths[0] = path; \ + bind_node( name##_flags_, name##_size_, \ + paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + +#define DECLARE_UNNAMED_NODE( name, flags, size ) \ +static const int name##_flags_ = flags; \ +static const int name##_size_ = size; + +#define DECLARE_NODE( name, flags, size, paths... ) \ +static const char * const name##_p[] = { paths }; \ +DECLARE_UNNAMED_NODE(name, flags, size) + +#define NODE_METHODS( name ) \ +static const method_t name##_m[] + +#define REGISTER_NODE( name ) do { \ + bind_node( name##_flags_, name##_size_, \ + name##_p, sizeof(name##_p)/sizeof(char*), \ + name##_m, sizeof(name##_m)/sizeof(method_t) ); \ + } while(0) + +extern void bind_node( int flags, int size, const char * const *paths, int npaths, + const method_t *methods, int nmethods ); + +extern void bind_new_node( int flags, int size, const char *name, + const method_t *methods, int nmethods ); + +#define INSTALL_OPEN 1 /* install trivial open and close methods */ + + + +#endif /* _H_BINDINGS */ Copied: trunk/openbios-devel/include/libopenbios/elfload.h (from r689, trunk/openbios-devel/include/openbios/elfload.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/elfload.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/elfload.h) @@ -0,0 +1,29 @@ +/* + * Creation Date: <2001/05/05 16:44:17 samuel> + * Time-stamp: <2003/10/22 23:18:42 samuel> + * + * <elfload.h> + * + * Elf loader + * + * Copyright (C) 2001, 2003 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#ifndef _H_ELFLOAD +#define _H_ELFLOAD + +#include "openbios/elf.h" +#include "asm/elf.h" + +extern int is_elf( int fd, int offs ); +extern int find_elf( int fd ); + +extern Elf32_Phdr * elf_readhdrs( int fd, int offs, Elf32_Ehdr *e ); + + +#endif /* _H_ELFLOAD */ Copied: trunk/openbios-devel/include/libopenbios/fontdata.h (from r689, trunk/openbios-devel/include/openbios/fontdata.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/fontdata.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/fontdata.h) @@ -0,0 +1,28 @@ +/* Font definitions */ + +#ifndef OPENBIOS_FONTDATA_H +#define OPENBIOS_FONTDATA_H + +#define FONTDATAMAX_8X8 2048 +#define FONT_WIDTH_8X8 8 +#define FONT_HEIGHT_8X8 8 + +extern const unsigned char fontdata_8x8[FONTDATAMAX_8X8]; + +#define FONTDATAMAX_8X16 4096 +#define FONT_WIDTH_8X16 8 +#define FONT_HEIGHT_8X16 16 + +extern const unsigned char fontdata_8x16[FONTDATAMAX_8X16]; + +#if defined(CONFIG_FONT_8X8) +#define fontdata fontdata_8x8 +#define FONT_HEIGHT FONT_HEIGHT_8X8 +#define FONT_WIDTH FONT_WIDTH_8X8 +#elif defined(CONFIG_FONT_8X16) +#define fontdata fontdata_8x16 +#define FONT_HEIGHT FONT_HEIGHT_8X16 +#define FONT_WIDTH FONT_WIDTH_8X16 +#endif + +#endif /* OPENBIOS_FONTDATA_H */ Copied: trunk/openbios-devel/include/libopenbios/ipchecksum.h (from r689, trunk/openbios-devel/include/ipchecksum.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/ipchecksum.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/ipchecksum.h) @@ -0,0 +1,7 @@ +#ifndef IPCHECKSUM_H +#define IPCHECKSUM_H + +unsigned short ipchksum(const void *data, unsigned long length); +unsigned short add_ipchksums(unsigned long offset, unsigned short sum, unsigned short new); + +#endif /* IPCHECKSUM_H */ Copied: trunk/openbios-devel/include/libopenbios/of.h (from r689, trunk/openbios-devel/include/openbios/of.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/of.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/openbios/of.h) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2004/01/07 19:19:18 samuel> + * Time-stamp: <2004/01/07 19:19:48 samuel> + * + * <of.h> + * + * OpenFirmware related defines + * + * Copyright (C) 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#ifndef _H_OF +#define _H_OF + +extern int of_client_interface( int *params ); + +#endif /* _H_OF */ Copied: trunk/openbios-devel/include/libopenbios/ofmem.h (from r689, trunk/openbios-devel/include/ofmem.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Mar 14 16:05:53 2010 (r691, copy of r689, trunk/openbios-devel/include/ofmem.h) @@ -0,0 +1,127 @@ +/* + * Creation Date: <1999/11/16 00:47:06 samuel> + * Time-stamp: <2003/10/18 13:28:14 samuel> + * + * <ofmem.h> + * + * + * + * Copyright (C) 1999, 2002 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#ifndef _H_OFMEM +#define _H_OFMEM + +#include "kernel/stack.h" + +typedef struct alloc_desc { + struct alloc_desc *next; + ucell size; /* size (including) this struct */ +} alloc_desc_t; + +typedef struct mem_range { + struct mem_range *next; + ucell start; + ucell size; +} range_t; + +typedef struct trans { + struct trans *next; + ucell virt; /* chain is sorted by virt */ + ucell size; + ucell phys; + ucell mode; +} translation_t; + +/* ofmem private data */ +typedef struct { + ucell ramsize; + char *next_malloc; + alloc_desc_t *mfree; /* list of free malloc blocks */ + + range_t *phys_range; + range_t *virt_range; + + translation_t *trans; /* this is really a translation_t */ +} ofmem_t; + +/* TODO: temporary migration interface */ +extern ofmem_t* ofmem_arch_get_private(void); +extern void* ofmem_arch_get_malloc_base(void); +extern ucell ofmem_arch_get_heap_top(void); +extern ucell ofmem_arch_get_virt_top(void); +extern ucell ofmem_arch_default_translation_mode( ucell phys ); +extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, + ucell mode); +extern void ofmem_arch_unmap_pages(ucell virt, ucell size); +/* sparc64 uses this method */ +extern int ofmem_map_page_range( ucell phys, ucell virt, ucell size, + ucell mode ); + +/* malloc interface */ +extern void* ofmem_malloc( size_t size ); +extern void ofmem_free( void *ptr ); +extern void* ofmem_realloc( void *ptr, size_t size ); + +/* ofmem_common.c */ + +extern void ofmem_cleanup( void ); +extern void ofmem_init( void ); + +/* + * register /memory and /virtual-memory handles + * ofmem module will update "available" and "translations" properties + * using these handles + * + * to disable updating /memory properties pass zero memory handle + */ +extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ); + +extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); +extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align ); +extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); + +extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); +extern int ofmem_unmap( ucell virt, ucell size ); + +extern void ofmem_release_phys( ucell phys, ucell size ); +extern void ofmem_release_virt( ucell virt, ucell size ); +extern ucell ofmem_translate( ucell virt, ucell *ret_mode ); + +#ifdef CONFIG_PPC +#define PAGE_SHIFT 12 + +ulong get_ram_top( void ); +ulong get_ram_bottom( void ); + +#elif defined(CONFIG_SPARC32) +#define PAGE_SHIFT 12 + +/* arch/sparc32/lib.c */ +struct mem; +extern struct mem cdvmem; + +void mem_init(struct mem *t, char *begin, char *limit); +void *mem_alloc(struct mem *t, int size, int align); +int map_page(unsigned long va, uint64_t epa, int type); +void *map_io(uint64_t pa, int size); +#endif + +#ifdef PAGE_SHIFT +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE - 1)) +#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) +#endif + +#if defined(CONFIG_DEBUG_OFMEM) +# define OFMEM_TRACE(fmt, ...) do { printk("OFMEM: " fmt, ## __VA_ARGS__); } while (0) +#else +# define OFMEM_TRACE(fmt, ...) do {} while(0) +#endif + +#endif /* _H_OFMEM */ Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libc/diskio.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" typedef struct { Modified: trunk/openbios-devel/libc/extra.c ============================================================================== --- trunk/openbios-devel/libc/extra.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libc/extra.c Sun Mar 14 16:05:53 2010 (r691) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "libc/string.h" #include "libc/vsprintf.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" /* strncpy without 0-pad */ char * Modified: trunk/openbios-devel/libopenbios/bindings.c ============================================================================== --- trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/bindings.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/string.h" #include "libc/stdlib.h" #include "libc/byteorder.h" Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/client.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,8 +15,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/of.h" +#include "libopenbios/bindings.h" +#include "libopenbios/of.h" /* Uncomment to enable debug printout of client interface calls */ //#define DEBUG_CIF Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/console_common.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,8 +13,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/fontdata.h" +#include "libopenbios/bindings.h" +#include "libopenbios/fontdata.h" #include "video_subr.h" #define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) Modified: trunk/openbios-devel/libopenbios/elfload.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/elfload.c Sun Mar 14 16:05:53 2010 (r691) @@ -30,8 +30,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/elfload.h" +#include "libopenbios/bindings.h" +#include "libopenbios/elfload.h" #include "libc/diskio.h" #include "openbios/elf.h" Modified: trunk/openbios-devel/libopenbios/elfnote.c ============================================================================== --- trunk/openbios-devel/libopenbios/elfnote.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/elfnote.c Sun Mar 14 16:05:53 2010 (r691) @@ -3,7 +3,7 @@ #include "elf_boot.h" #include "sys_info.h" #include "asm/io.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "openbios-version.h" #define printf printk #define debug printk Modified: trunk/openbios-devel/libopenbios/font_8x16.c ============================================================================== --- trunk/openbios-devel/libopenbios/font_8x16.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/font_8x16.c Sun Mar 14 16:05:53 2010 (r691) @@ -7,7 +7,7 @@ * * **********************************************/ -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" const unsigned char fontdata_8x16[FONTDATAMAX_8X16] = { Modified: trunk/openbios-devel/libopenbios/font_8x8.c ============================================================================== --- trunk/openbios-devel/libopenbios/font_8x8.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/font_8x8.c Sun Mar 14 16:05:53 2010 (r691) @@ -4,7 +4,7 @@ /* */ /**********************************************/ -#include "openbios/fontdata.h" +#include "libopenbios/fontdata.h" const unsigned char fontdata_8x8[FONTDATAMAX_8X8] = { Modified: trunk/openbios-devel/libopenbios/ipchecksum.c ============================================================================== --- trunk/openbios-devel/libopenbios/ipchecksum.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/ipchecksum.c Sun Mar 14 16:05:53 2010 (r691) @@ -1,6 +1,6 @@ /* Taken from Etherboot */ -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" unsigned short ipchksum(const void *data, unsigned long length) { Modified: trunk/openbios-devel/libopenbios/linuxbios.c ============================================================================== --- trunk/openbios-devel/libopenbios/linuxbios.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/linuxbios.c Sun Mar 14 16:05:53 2010 (r691) @@ -5,7 +5,7 @@ #include "asm/types.h" #include "asm/io.h" #include "linuxbios.h" -#include "ipchecksum.h" +#include "libopenbios/ipchecksum.h" #include "sys_info.h" #ifdef CONFIG_DEBUG_BOOT Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,8 +13,8 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" -#include "ofmem.h" +#include "libopenbios/bindings.h" +#include "libopenbios/ofmem.h" /* * define OFMEM_FILL_RANGE to claim any unclaimed virtual and Modified: trunk/openbios-devel/packages/bootinfo-loader.c ============================================================================== --- trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/bootinfo-loader.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "libc/vsprintf.h" //#define DEBUG_BOOTINFO Modified: trunk/openbios-devel/packages/cmdline.c ============================================================================== --- trunk/openbios-devel/packages/cmdline.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/cmdline.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" #include "libc/vsprintf.h" Modified: trunk/openbios-devel/packages/deblocker.c ============================================================================== --- trunk/openbios-devel/packages/deblocker.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/deblocker.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/disk-label.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/elf-loader.c ============================================================================== --- trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/elf-loader.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios/elf.h" #include "asm/elf.h" Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/mac-parts.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "mac-parts.h" #include "packages.h" Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/misc-files.c Sun Mar 14 16:05:53 2010 (r691) @@ -16,7 +16,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" #include "packages.h" Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/nvram.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "openbios/nvram.h" #ifdef CONFIG_DEBUG_NVRAM Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/pc-parts.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,7 +13,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/sun-parts.c Sun Mar 14 16:05:53 2010 (r691) @@ -13,7 +13,7 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/byteorder.h" #include "packages.h" Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/video.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "libc/diskio.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios/drivers.h" #include "video_subr.h" Modified: trunk/openbios-devel/packages/xcoff-loader.c ============================================================================== --- trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 15:33:32 2010 (r690) +++ trunk/openbios-devel/packages/xcoff-loader.c Sun Mar 14 16:05:53 2010 (r691) @@ -15,9 +15,9 @@ */ #include "openbios/config.h" -#include "openbios/bindings.h" +#include "libopenbios/bindings.h" #include "packages.h" -#include "ofmem.h" +#include "libopenbios/ofmem.h" #include "openbios/xcoff.h"

1 0

[commit] r690 - in trunk/openbios-devel: fs fs/ext2 fs/grubfs fs/hfs fs/hfsplus fs/iso9660 include/fs include/openbios packages
by repository service March 14, 2010

March 14, 2010

Author: mcayland Date: Sun Mar 14 15:33:32 2010 New Revision: 690 URL: http://tracker.coreboot.org/trac/openbios/changeset/690 Log: Move the fs header file into include/fs to synchronise with the code directory structure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/fs/ trunk/openbios-devel/include/fs/fs.h (props changed) - copied unchanged from r689, trunk/openbios-devel/include/openbios/fs.h Deleted: trunk/openbios-devel/include/openbios/fs.h Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/iso9660/iso9660_fs.c trunk/openbios-devel/packages/misc-files.c Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -8,7 +8,7 @@ #include "libext2.h" #include "ext2_utils.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/vsprintf.h" typedef struct { Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "filesys.h" #include "glue.h" #include "libc/diskio.h" Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/vsprintf.h" #include "libhfs.h" Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -15,7 +15,7 @@ */ #include "openbios/config.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libhfsp.h" #include "volume.h" #include "record.h" Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/ioglue.c Sun Mar 14 15:33:32 2010 (r690) @@ -16,7 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/diskio.h" #include "os.h" #include "hfs_mdb.h" Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Mar 14 15:33:32 2010 (r690) @@ -5,7 +5,7 @@ */ #include "libiso9660.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/vsprintf.h" typedef struct { Copied: trunk/openbios-devel/include/fs/fs.h (from r689, trunk/openbios-devel/include/openbios/fs.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/fs/fs.h Sun Mar 14 15:33:32 2010 (r690, copy of r689, trunk/openbios-devel/include/openbios/fs.h) @@ -0,0 +1,90 @@ +/* + * Creation Date: <2001/05/06 17:12:45 samuel> + * Time-stamp: <2003/10/22 11:43:45 samuel> + * + * <fs_loader.h> + * + * Generic file system access + * + * Copyright (C) 2001, 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#ifndef _H_FS +#define _H_FS + + +typedef struct fs_ops fs_ops_t; +typedef struct opaque_struct file_desc_t; + +#define fs_open_path( fs, path ) (fs)->open_path( fs, path ) +#define fs_search_rom( fs ) (fs)->search_rom( fs ) +#define fs_search_file( fs, name ) (fs)->search_file( fs, name ) +#define fs_vol_name( fs, buf, size ) (fs)->vol_name( fs, buf, size ) + +struct fs_ops { + void *fs_data; + int fd; /* owner block device */ + int type; + + void (*close_fs)( fs_ops_t *fs ); + file_desc_t *(*open_path)( fs_ops_t *fs, const char *path ); + file_desc_t *(*search_rom)( fs_ops_t *fs ); + file_desc_t *(*search_file)( fs_ops_t *fs, const char *name ); + char *(*vol_name)( fs_ops_t *fs, char *buf, int size ); + + /* file ops */ + void (*close)( file_desc_t *file ); + int (*read)( file_desc_t *file, void *buf, size_t count ); + int (*lseek)( file_desc_t *file, off_t offset, int whence ); + char *(*get_path)( file_desc_t *file, char *buf, int len ); + void (*dir)( file_desc_t *file ); + + const char *(*get_fstype)( fs_ops_t *fs ); +}; + +extern fs_ops_t *fs_open( int fs_type, int fd ); +extern void fs_close( fs_ops_t *fs ); +const char *fs_get_name( fs_ops_t *fs ); + +#ifdef CONFIG_HFSP +extern int fs_hfsp_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_hfsp_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_HFS +extern int fs_hfs_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_hfs_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_ISO9660 +extern int fs_iso9660_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_iso9660_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_EXT2 +extern int fs_ext2_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_ext2_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + +#ifdef CONFIG_GRUBFS +extern int fs_grubfs_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_grubfs_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + + + +/* misc */ +extern char *get_hfs_vol_name( int fd, char *buf, int size ); + + +#endif /* _H_FS */ Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Mar 14 15:21:02 2010 (r689) +++ trunk/openbios-devel/packages/misc-files.c Sun Mar 14 15:33:32 2010 (r690) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/fs.h" +#include "fs/fs.h" #include "libc/diskio.h" #include "packages.h"

1 0

[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...
by repository service March 14, 2010

March 14, 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(a)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

1 0

[commit] r688 - in trunk/openbios-devel: arch/ppc/qemu arch/unix include/arch/ppc include/arch/unix include/ppc include/unix
by repository service March 14, 2010

March 14, 2010

Author: mcayland Date: Sun Mar 14 14:54:45 2010 New Revision: 688 URL: http://tracker.coreboot.org/trac/openbios/changeset/688 Log: Finish move of architecture-specific header files, with modifications to the header paths as required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/ppc/ (props changed) - copied from r686, trunk/openbios-devel/include/ppc/ trunk/openbios-devel/include/arch/unix/ (props changed) - copied from r686, trunk/openbios-devel/include/unix/ Deleted: trunk/openbios-devel/include/ppc/ trunk/openbios-devel/include/unix/ Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/unix/unix.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 14:47:44 2010 (r687) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Mar 14 14:54:45 2010 (r688) @@ -32,7 +32,7 @@ #include "libc/vsprintf.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" -#include "ppc/processor.h" +#include "arch/ppc/processor.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 14:47:44 2010 (r687) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Mar 14 14:54:45 2010 (r688) @@ -24,7 +24,7 @@ #include "libc/string.h" #include "qemu/qemu.h" #include "ofmem.h" -#include "ppc/processor.h" +#include "arch/ppc/processor.h" /************************************************************************/ /* RTAS (run-time abstraction services) */ Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 14:47:44 2010 (r687) +++ trunk/openbios-devel/arch/unix/unix.c Sun Mar 14 14:54:45 2010 (r688) @@ -30,7 +30,7 @@ #include "openbios/kernel.h" #include "dict.h" #include "openbios/stack.h" -#include "unix/plugins.h" +#include "arch/unix/plugins.h" #include "openbios/bindings.h" #include "openbios-version.h"

1 0

[commit] r687 - in trunk/openbios-devel: config/scripts include/amd64 include/arch include/arch/amd64 include/arch/ia64 include/arch/sparc32 include/arch/sparc64 include/arch/x86 include/ia64 inclu...
by repository service March 14, 2010

March 14, 2010

Author: mcayland Date: Sun Mar 14 14:47:44 2010 New Revision: 687 URL: http://tracker.coreboot.org/trac/openbios/changeset/687 Log: Begin tidying up of header locations as described on the mailing list. Firstly we move all of the architecture-specific header files from include/$ARCH to include/arch/$ARCH. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/include/arch/ trunk/openbios-devel/include/arch/amd64/ (props changed) - copied from r686, trunk/openbios-devel/include/amd64/ trunk/openbios-devel/include/arch/ia64/ (props changed) - copied from r686, trunk/openbios-devel/include/ia64/ trunk/openbios-devel/include/arch/sparc32/ (props changed) - copied from r686, trunk/openbios-devel/include/sparc32/ trunk/openbios-devel/include/arch/sparc64/ (props changed) - copied from r686, trunk/openbios-devel/include/sparc64/ trunk/openbios-devel/include/arch/x86/ (props changed) - copied from r686, trunk/openbios-devel/include/x86/ Deleted: trunk/openbios-devel/include/amd64/ trunk/openbios-devel/include/ia64/ trunk/openbios-devel/include/sparc32/ trunk/openbios-devel/include/sparc64/ trunk/openbios-devel/include/x86/ Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Mar 13 13:44:22 2010 (r686) +++ trunk/openbios-devel/config/scripts/switch-arch Sun Mar 14 14:47:44 2010 (r687) @@ -190,9 +190,9 @@ mkdir -p $OBJDIR/host/include mkdir -p $OBJDIR/host/kernel mkdir -p $OBJDIR/forth - ln -s ../../../include/$ARCH $OBJDIR/target/include/asm + ln -s ../../../include/arch/$ARCH $OBJDIR/target/include/asm #compile the host binary with target settings instead - #ln -s ../../../include/$HOSTARCH $OBJDIR/host/include/asm + #ln -s ../../../include/arch/$HOSTARCH $OBJDIR/host/include/asm echo "ok." cd $OBJDIR

1 0