aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2015-10-14 22:01:29 +0100
committerMichael Brown <mcb30@ipxe.org>2015-10-14 22:16:45 +0100
commit79afe60b0931f56ea2ee596aaae61f5ff0194de6 (patch)
tree9494a7ff02bd217818ba87a7d6fbcbbc71869dcc /src/include
parentbc69777a4044c09cfed65d84f11988448b2db277 (diff)
downloadipxe-79afe60b0931f56ea2ee596aaae61f5ff0194de6.zip
ipxe-79afe60b0931f56ea2ee596aaae61f5ff0194de6.tar.gz
ipxe-79afe60b0931f56ea2ee596aaae61f5ff0194de6.tar.bz2
[fbcon] Move margin calculations to fbcon.c
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/ipxe/fbcon.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/include/ipxe/fbcon.h b/src/include/ipxe/fbcon.h
index 7837845..42ffca3 100644
--- a/src/include/ipxe/fbcon.h
+++ b/src/include/ipxe/fbcon.h
@@ -12,8 +12,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <stdint.h>
#include <ipxe/ansiesc.h>
#include <ipxe/uaccess.h>
-
-struct pixel_buffer;
+#include <ipxe/console.h>
/** Character width, in pixels */
#define FBCON_CHAR_WIDTH 9
@@ -149,10 +148,9 @@ struct fbcon {
extern int fbcon_init ( struct fbcon *fbcon, userptr_t start,
struct fbcon_geometry *pixel,
- struct fbcon_margin *margin,
struct fbcon_colour_map *map,
struct fbcon_font *font,
- struct pixel_buffer *pixbuf );
+ struct console_configuration *config );
extern void fbcon_fini ( struct fbcon *fbcon );
extern void fbcon_putchar ( struct fbcon *fbcon, int character );