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