aboutsummaryrefslogtreecommitdiffstats
path: root/com32
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-07-26 10:13:05 +0100
committerMatt Fleming <matt.fleming@intel.com>2013-07-26 10:24:01 +0100
commitdbf87405a0eb3de617365feae146b0371158feb2 (patch)
tree774d7433fbf1c41596f1a479c975653c73385805 /com32
parent5e1a2c5a40d591d72bb6dabbb8e0685298934a9e (diff)
downloadsyslinux-dbf87405a0eb3de617365feae146b0371158feb2.tar.gz
syslinux-dbf87405a0eb3de617365feae146b0371158feb2.tar.xz
syslinux-dbf87405a0eb3de617365feae146b0371158feb2.zip
video.h: we need one syslinux_force_text_mode() prototype
Use the one from syslinux/video.h. This makes it easier to write unit tests for syslinux/load_linux.c without pulling in loads of core definitions from core/include/graphics.h. It can also be argued that syslinux_* symbols should have prototypes in syslinux/*.h files. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32')
-rw-r--r--com32/cmenu/libmenu/syslnx.c1
-rw-r--r--com32/elflink/ldlinux/msg.c1
-rw-r--r--com32/lib/syslinux/load_linux.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/com32/cmenu/libmenu/syslnx.c b/com32/cmenu/libmenu/syslnx.c
index 5060c5db..73ec2a7c 100644
--- a/com32/cmenu/libmenu/syslnx.c
+++ b/com32/cmenu/libmenu/syslnx.c
@@ -16,6 +16,7 @@
#include <graphics.h>
#include "syslnx.h"
#include <syslinux/config.h>
+#include <syslinux/video.h>
com32sys_t inreg, outreg; // Global registers for this module
diff --git a/com32/elflink/ldlinux/msg.c b/com32/elflink/ldlinux/msg.c
index 9ded33ef..1a97b3c0 100644
--- a/com32/elflink/ldlinux/msg.c
+++ b/com32/elflink/ldlinux/msg.c
@@ -1,3 +1,4 @@
+#include <syslinux/video.h>
#include <com32.h>
#include <stdio.h>
#include <bios.h>
diff --git a/com32/lib/syslinux/load_linux.c b/com32/lib/syslinux/load_linux.c
index 37c8df02..df934e40 100644
--- a/com32/lib/syslinux/load_linux.c
+++ b/com32/lib/syslinux/load_linux.c
@@ -40,7 +40,6 @@
#include <minmax.h>
#include <errno.h>
#include <suffix_number.h>
-#include <graphics.h>
#include <dprintf.h>
#include <syslinux/align.h>
@@ -48,6 +47,7 @@
#include <syslinux/bootrm.h>
#include <syslinux/movebits.h>
#include <syslinux/firmware.h>
+#include <syslinux/video.h>
#define BOOT_MAGIC 0xAA55
#define LINUX_MAGIC ('H' + ('d' << 8) + ('r' << 16) + ('S' << 24))