wok-current rev 17161
syslinux/iso2exe: full zImage support (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Sep 17 15:21:35 2014 +0200 (2014-09-17) |
parents | 3e7ad70145ce |
children | 78f834363e9e |
files | syslinux/stuff/iso2exe/a20.c syslinux/stuff/iso2exe/bootlinux.c |
line diff
1.1 --- a/syslinux/stuff/iso2exe/a20.c Wed Sep 17 11:38:34 2014 +0200 1.2 +++ b/syslinux/stuff/iso2exe/a20.c Wed Sep 17 15:21:35 2014 +0200 1.3 @@ -5,7 +5,7 @@ 1.4 static int a20buffer = 0; 1.5 static void movehia20(void) 1.6 { 1.7 - if ((mem.base - 0x100000UL) >= 0x10000UL) { 1.8 + if ((mem.base >> 16) != 0x10) { 1.9 movehi(); 1.10 return; 1.11 } 1.12 @@ -25,10 +25,9 @@ 1.13 } 1.14 #define movehi movehia20 1.15 1.16 -#define REALMODE_SWITCH _realmode_switch_a20 1.17 -static void realmode_switch_a20(void) 1.18 +static void dosshutdowna20(void) 1.19 { 1.20 - if (!a20buffer) return; 1.21 + if (a20buffer) { 1.22 #asm 1.23 pusha // more than 1Mb => 286+ 1.24 xor di, di // 30 1.25 @@ -59,6 +58,10 @@ 1.26 add sp, #0x30 1.27 popa 1.28 #endasm 1.29 + } 1.30 + dosshutdown(); 1.31 } 1.32 1.33 +#define dosshutdown dosshutdowna20 1.34 + 1.35 #endif