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@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@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@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@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@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"