View | Details | Raw Unified | Return to bug 138257
Collapse All | Expand All

(-)syslinux-3.11/isolinux.asm (+3 lines)
Lines 1237-1242 Link Here
1237
; 0xFFFF in case we should execute INT 18h ("next device.")
1237
; 0xFFFF in case we should execute INT 18h ("next device.")
1238
;
1238
;
1239
local_boot:
1239
local_boot:
1240
%ifdef WITH_GFX
1241
		call gfx_done
1242
%endif
1240
		call vgaclearmode
1243
		call vgaclearmode
1241
		lss sp,[cs:Stack]		; Restore stack pointer
1244
		lss sp,[cs:Stack]		; Restore stack pointer
1242
		xor dx,dx
1245
		xor dx,dx
(-)syslinux-3.11/gfxboot.inc (+2 lines)
Lines 531-536 Link Here
531
;  return:	[gfx_ok] = 0
531
;  return:	[gfx_ok] = 0
532
;
532
;
533
gfx_done:
533
gfx_done:
534
		push ax
534
		cmp byte [gfx_ok],0
535
		cmp byte [gfx_ok],0
535
		jz gfx_done_90
536
		jz gfx_done_90
536
		call far [gfx_bc_done]
537
		call far [gfx_bc_done]
Lines 542-547 Link Here
542
		jz gfx_done_90
543
		jz gfx_done_90
543
		mov [cwritestr],al
544
		mov [cwritestr],al
544
gfx_done_90:
545
gfx_done_90:
546
		pop ax
545
		ret
547
		ret
546
548
547
549
(-)syslinux-3.11/ldlinux.asm (-1 / +7 lines)
Lines 942-947 Link Here
942
; 0xFFFF in case we should execute INT 18h ("next device.")
942
; 0xFFFF in case we should execute INT 18h ("next device.")
943
;
943
;
944
local_boot:
944
local_boot:
945
%ifdef WITH_GFX
946
		call gfx_done
947
%endif
945
		call vgaclearmode
948
		call vgaclearmode
946
		lss sp,[cs:Stack]		; Restore stack pointer
949
		lss sp,[cs:Stack]		; Restore stack pointer
947
		xor dx,dx
950
		xor dx,dx
948
-- syslinux-3.11.orig/pxelinux.asm
951
++ syslinux-3.11/pxelinux.asm
Lines 903-908 Link Here
903
; AX contains the appropriate return code.
903
; AX contains the appropriate return code.
904
;
904
;
905
local_boot:
905
local_boot:
906
%ifdef WITH_GFX
907
		call gfx_done
908
%endif
906
		push cs
909
		push cs
907
		pop ds
910
		pop ds
908
		mov [LocalBootType],ax
911
		mov [LocalBootType],ax

Return to bug 138257