summaryrefslogtreecommitdiff
path: root/src/devices/oprom
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-03-17 04:04:20 +0000
committerStefan Reinauer <stepan@openbios.org>2010-03-17 04:04:20 +0000
commit3c486f8f76b2ad526538af14cf5cf74fcf627ba9 (patch)
treeb3266ed0d85f4ac18a710c4d164914414d17ce75 /src/devices/oprom
parent87489e1ab226d4efc26d1b69dbfec8e16bfca82a (diff)
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
Diffstat (limited to 'src/devices/oprom')
-rw-r--r--src/devices/oprom/yabel/compat/functions.c5
-rw-r--r--src/devices/oprom/yabel/vbe.c8
-rw-r--r--src/devices/oprom/yabel/vbe.h6
3 files changed, 13 insertions, 6 deletions
diff --git a/src/devices/oprom/yabel/compat/functions.c b/src/devices/oprom/yabel/compat/functions.c
index 6367fb025d..035c8bc86e 100644
--- a/src/devices/oprom/yabel/compat/functions.c
+++ b/src/devices/oprom/yabel/compat/functions.c
@@ -18,6 +18,7 @@
#include <device/device.h>
#include "../debug.h"
#include "../biosemu.h"
+#include "../vbe.h"
#include "../compat/time.h"
#define VMEM_SIZE (1024 * 1024) /* 1 MB */
@@ -32,10 +33,6 @@ u8* vmem = (u8 *) (16*1024*1024); /* default to 16MB */
u8* vmem = NULL;
#endif
-#if CONFIG_BOOTSPLASH
-void vbe_set_graphics(void);
-#endif
-
void run_bios(struct device * dev, unsigned long addr)
{
diff --git a/src/devices/oprom/yabel/vbe.c b/src/devices/oprom/yabel/vbe.c
index 6326a9c214..d80a97acc6 100644
--- a/src/devices/oprom/yabel/vbe.c
+++ b/src/devices/oprom/yabel/vbe.c
@@ -31,6 +31,7 @@
#include "mem.h"
#include "interrupt.h"
#include "device.h"
+#include "vbe.h"
#include <cbfs.h>
@@ -153,6 +154,7 @@ vbe_prepare(void)
return 0; // successfull init
}
+#if CONFIG_BOOTSPLASH || CONFIG_EXPERT
// VBE Function 00h
static u8
vbe_info(vbe_info_t * info)
@@ -299,7 +301,9 @@ vbe_set_mode(vbe_mode_info_t * mode_info)
}
return 0;
}
+#endif
+#if CONFIG_EXPERT
//VBE Function 08h
static u8
vbe_set_palette_format(u8 format)
@@ -762,6 +766,7 @@ vbe_get_info(void)
}
return 0;
}
+#endif
#if CONFIG_BOOTSPLASH
vbe_mode_info_t mode_info;
@@ -769,7 +774,6 @@ vbe_mode_info_t mode_info;
void vbe_set_graphics(void)
{
u8 rval;
- int i;
vbe_info_t 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
* cares. */
- int imagesize = 1024*768*2;
+ // int imagesize = 1024*768*2;
unsigned char *jpeg = cbfs_find_file("bootsplash.jpg", CBFS_TYPE_BOOTSPLASH);
if (!jpeg) {
diff --git a/src/devices/oprom/yabel/vbe.h b/src/devices/oprom/yabel/vbe.h
index 07daedb672..6ddeeef292 100644
--- a/src/devices/oprom/yabel/vbe.h
+++ b/src/devices/oprom/yabel/vbe.h
@@ -13,4 +13,10 @@
#ifndef _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