From dbf87405a0eb3de617365feae146b0371158feb2 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt.fleming@intel.com>
Date: Fri, 26 Jul 2013 10:13:05 +0100
Subject: 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>
---
 com32/cmenu/libmenu/syslnx.c    | 1 +
 com32/elflink/ldlinux/msg.c     | 1 +
 com32/lib/syslinux/load_linux.c | 2 +-
 core/bios.c                     | 1 +
 core/font.c                     | 1 +
 core/graphics.c                 | 1 +
 core/include/graphics.h         | 1 -
 core/localboot.c                | 2 +-
 core/plaincon.c                 | 1 +
 core/rawcon.c                   | 1 +
 10 files changed, 9 insertions(+), 3 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))
diff --git a/core/bios.c b/core/bios.c
index 5344833a..9e911947 100644
--- a/core/bios.c
+++ b/core/bios.c
@@ -6,6 +6,7 @@
 #include <graphics.h>
 #include <syslinux/memscan.h>
 #include <syslinux/firmware.h>
+#include <syslinux/video.h>
 
 #include <sys/vesa/vesa.h>
 #include <sys/vesa/video.h>
diff --git a/core/font.c b/core/font.c
index 30c0afb8..7dd8be78 100644
--- a/core/font.c
+++ b/core/font.c
@@ -20,6 +20,7 @@
  */
 
 #include <syslinux/firmware.h>
+#include <syslinux/video.h>
 #include <sys/io.h>
 #include <stdio.h>
 #include <fs.h>
diff --git a/core/graphics.c b/core/graphics.c
index 834372ff..1efb2faf 100644
--- a/core/graphics.c
+++ b/core/graphics.c
@@ -24,6 +24,7 @@
 
 #include "bios.h"
 #include "graphics.h"
+#include <syslinux/video.h>
 
 __export uint8_t UsingVGA = 0;
 uint16_t VGAPos;		/* Pointer into VGA memory */
diff --git a/core/include/graphics.h b/core/include/graphics.h
index 814ffe7d..651b7bc6 100644
--- a/core/include/graphics.h
+++ b/core/include/graphics.h
@@ -50,7 +50,6 @@ extern uint8_t UserFont;
 
 extern __lowmem char fontbuf[8192];
 
-extern void syslinux_force_text_mode(void);
 extern void vgadisplayfile(FILE *_fd);
 extern void using_vga(uint8_t vga, uint16_t pix_cols, uint16_t pix_rows);
 
diff --git a/core/localboot.c b/core/localboot.c
index 0f4b5820..a4df9171 100644
--- a/core/localboot.c
+++ b/core/localboot.c
@@ -16,7 +16,7 @@
 #include <core.h>
 #include <fs.h>
 #include <bios.h>
-#include <graphics.h>
+#include <syslinux/video.h>
 
 /*
  * localboot.c
diff --git a/core/plaincon.c b/core/plaincon.c
index 8f8ca7ca..2b7c4a63 100644
--- a/core/plaincon.c
+++ b/core/plaincon.c
@@ -4,6 +4,7 @@
 
 #include "bios.h"
 #include "graphics.h"
+#include <syslinux/video.h>
 
 /*
  * Write a single character in AL to the console without
diff --git a/core/rawcon.c b/core/rawcon.c
index 92f0898a..6910a849 100644
--- a/core/rawcon.c
+++ b/core/rawcon.c
@@ -9,6 +9,7 @@
 
 #include "bios.h"
 #include "graphics.h"
+#include <syslinux/video.h>
 
 __export void writechr(char data)
 {
-- 
cgit v1.2.1