GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up warnings in yabel vbe code. No more warnings on the IP1000 

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5248 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2010-03-17 04:04:20 +00:00 committed by Stefan Reinauer
parent 87489e1ab2
commit 3c486f8f76
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/devices/oprom/yabel/compat/functions.c
View File

@ -18,6 +18,7 @@
#include <device/device.h> #include <device/device.h>
#include "../debug.h" #include "../debug.h"
#include "../biosemu.h" #include "../biosemu.h"
#include "../vbe.h"
#include "../compat/time.h" #include "../compat/time.h"
#define VMEM_SIZE (1024 * 1024) /* 1 MB */ #define VMEM_SIZE (1024 * 1024) /* 1 MB */
@ -32,10 +33,6 @@ u8* vmem = (u8 *) (16*1024*1024); /* default to 16MB */
u8* vmem = NULL; u8* vmem = NULL;
#endif #endif
#if CONFIG_BOOTSPLASH
void vbe_set_graphics(void);
#endif
void run_bios(struct device * dev, unsigned long addr) void run_bios(struct device * dev, unsigned long addr)
{ {

8
src/devices/oprom/yabel/vbe.c
View File

@ -31,6 +31,7 @@
#include "mem.h" #include "mem.h"
#include "interrupt.h" #include "interrupt.h"
#include "device.h" #include "device.h"
#include "vbe.h"
#include <cbfs.h> #include <cbfs.h>
@ -153,6 +154,7 @@ vbe_prepare(void)
return 0; // successfull init return 0; // successfull init
} }
#if CONFIG_BOOTSPLASH || CONFIG_EXPERT
// VBE Function 00h // VBE Function 00h
static u8 static u8
vbe_info(vbe_info_t * info) vbe_info(vbe_info_t * info)
@ -299,7 +301,9 @@ vbe_set_mode(vbe_mode_info_t * mode_info)
} }
return 0; return 0;
} }
#endif
#if CONFIG_EXPERT
//VBE Function 08h //VBE Function 08h
static u8 static u8
vbe_set_palette_format(u8 format) vbe_set_palette_format(u8 format)
@ -762,6 +766,7 @@ vbe_get_info(void)
} }
return 0; return 0;
} }
#endif
#if CONFIG_BOOTSPLASH #if CONFIG_BOOTSPLASH
vbe_mode_info_t mode_info; vbe_mode_info_t mode_info;
@ -769,7 +774,6 @@ vbe_mode_info_t mode_info;
void vbe_set_graphics(void) void vbe_set_graphics(void)
{ {
u8 rval; u8 rval;
int i;
vbe_info_t info; vbe_info_t info;
rval = vbe_info(&info); rval = vbe_info(&info);
@ -802,7 +806,7 @@ void vbe_set_graphics(void)
/* Switching Intel IGD to 1MB video memory will break this. Who /* Switching Intel IGD to 1MB video memory will break this. Who
* cares. */ * cares. */
int imagesize = 1024*768*2; // int imagesize = 1024*768*2;
unsigned char *jpeg = cbfs_find_file("bootsplash.jpg", CBFS_TYPE_BOOTSPLASH); unsigned char *jpeg = cbfs_find_file("bootsplash.jpg", CBFS_TYPE_BOOTSPLASH);
if (!jpeg) { if (!jpeg) {

6
src/devices/oprom/yabel/vbe.h
View File

@ -13,4 +13,10 @@
#ifndef _BIOSEMU_VBE_H_ #ifndef _BIOSEMU_VBE_H_
#define _BIOSEMU_VBE_H_ #define _BIOSEMU_VBE_H_
struct lb_framebuffer;
void vbe_set_graphics(void);
void fill_lb_framebuffer(struct lb_framebuffer *framebuffer);
void vbe_textmode_console(void);
#endif #endif