[syslinux:elflink] core: Only adjust screen if we're in text mode

syslinux-bot for Matt Fleming matt.fleming at intel.com
Mon Mar 26 15:36:03 PDT 2012


Commit-ID:  43499c9dc347ee858e9e395eba0954ec52a410ef
Gitweb:     http://www.syslinux.org/commit/43499c9dc347ee858e9e395eba0954ec52a410ef
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Tue, 14 Feb 2012 13:34:00 +0000
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Wed, 21 Mar 2012 10:24:24 +0000

core: Only adjust screen if we're in text mode

A bug was introduced in commit 9f51b69d ("core: Reimplement lots asm
code in C") when converting the old asm comapi_usingvga function into
C. We only want to adjust the screen if we're not using VGA.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 core/graphics.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/core/graphics.c b/core/graphics.c
index 864550b..4a4af55 100644
--- a/core/graphics.c
+++ b/core/graphics.c
@@ -367,10 +367,6 @@ void pm_usingvga(com32sys_t *regs)
 	GXPixCols = regs->ecx.w[0];
 	GXPixRows = regs->edx.w[0];
 
-	if (UsingVGA & 0x08)
-		regs->eflags.l &= ~EFLAGS_CF;
-	else {
+	if (!(UsingVGA & 0x08))
 		adjust_screen();
-		set_flags(regs, EFLAGS_CF);
-	}
 }


More information about the Syslinux-commits mailing list