[commit] r5248 - in trunk/src/devices/oprom/yabel: . compat

[repository service]

Author: stepan
Date: Wed Mar 17 05:04:20 2010
New Revision: 5248
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5248

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

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/devices/oprom/yabel/compat/functions.c
   trunk/src/devices/oprom/yabel/vbe.c
   trunk/src/devices/oprom/yabel/vbe.h

Modified: trunk/src/devices/oprom/yabel/compat/functions.c
==============================================================================
--- trunk/src/devices/oprom/yabel/compat/functions.c	Wed Mar 17 05:03:22 2010	(r5247)
+++ trunk/src/devices/oprom/yabel/compat/functions.c	Wed Mar 17 05:04:20 2010	(r5248)
@@ -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 = NULL;
 #endif

-#if CONFIG_BOOTSPLASH
-void vbe_set_graphics(void);
-#endif
-
 void run_bios(struct device * dev, unsigned long addr)
 {

Modified: trunk/src/devices/oprom/yabel/vbe.c
==============================================================================
--- trunk/src/devices/oprom/yabel/vbe.c	Wed Mar 17 05:03:22 2010	(r5247)
+++ trunk/src/devices/oprom/yabel/vbe.c	Wed Mar 17 05:04:20 2010	(r5248)
@@ -31,6 +31,7 @@
 #include "mem.h"
 #include "interrupt.h"
 #include "device.h"
+#include "vbe.h"

#include <cbfs.h>

@@ -153,6 +154,7 @@
    return 0;		// successfull init
 }

+#if CONFIG_BOOTSPLASH || CONFIG_EXPERT
 // VBE Function 00h
 static u8
 vbe_info(vbe_info_t * info)
@@ -299,7 +301,9 @@
    }
    return 0;
 }
+#endif

+#if CONFIG_EXPERT
 //VBE Function 08h
 static u8
 vbe_set_palette_format(u8 format)
@@ -762,6 +766,7 @@
    }
    return 0;
 }
+#endif

#if CONFIG_BOOTSPLASH
 vbe_mode_info_t mode_info;
@@ -769,7 +774,6 @@
 void vbe_set_graphics(void)
 {
    u8 rval;
-	int i;

vbe_info_t info;
    rval = vbe_info(&info);
@@ -802,7 +806,7 @@

/* 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) {

Modified: trunk/src/devices/oprom/yabel/vbe.h
==============================================================================
--- trunk/src/devices/oprom/yabel/vbe.h	Wed Mar 17 05:03:22 2010	(r5247)
+++ trunk/src/devices/oprom/yabel/vbe.h	Wed Mar 17 05:04:20 2010	(r5248)
@@ -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