# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1410960095 -7200
# Node ID c15bb3c9e12dcfa67498432706e28d3193499081
# Parent  3e7ad70145ce9921284fd7ad85519de040a9e015
syslinux/iso2exe: full zImage support (again)

diff -r 3e7ad70145ce -r c15bb3c9e12d syslinux/stuff/iso2exe/a20.c
--- a/syslinux/stuff/iso2exe/a20.c	Wed Sep 17 11:38:34 2014 +0200
+++ b/syslinux/stuff/iso2exe/a20.c	Wed Sep 17 15:21:35 2014 +0200
@@ -5,7 +5,7 @@
 static int a20buffer = 0;
 static void movehia20(void)
 {
-	if ((mem.base - 0x100000UL) >= 0x10000UL) {
+	if ((mem.base >> 16) != 0x10) {
 		movehi();
 		return;
 	}
@@ -25,10 +25,9 @@
 }
 #define movehi movehia20
 
-#define REALMODE_SWITCH _realmode_switch_a20
-static void realmode_switch_a20(void)
+static void dosshutdowna20(void)
 {
-	if (!a20buffer) return;
+	if (a20buffer) {
 #asm
 		pusha			// more than 1Mb => 286+
 		xor	di, di		// 30
@@ -59,6 +58,10 @@
 		add	sp, #0x30
 		popa
 #endasm
+	}
+	dosshutdown();
 }
 
+#define dosshutdown dosshutdowna20
+
 #endif
diff -r 3e7ad70145ce -r c15bb3c9e12d syslinux/stuff/iso2exe/bootlinux.c
--- a/syslinux/stuff/iso2exe/bootlinux.c	Wed Sep 17 11:38:34 2014 +0200
+++ b/syslinux/stuff/iso2exe/bootlinux.c	Wed Sep 17 15:21:35 2014 +0200
@@ -425,7 +425,7 @@
 		inc	bx
 		inc	cx
 		cmp	dl, bl
-		jne	mvdown
+		ja	mvdown
 		jmp	notzimage
 #endif
 lowsys: