# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1490536403 -7200
# Node ID de17d022fe9c12444d397ed38da62a6bb8ef2060
# Parent  28e3408ee72212eefd97d0675103e30f57b114ef
syslinux/bootiso.S: remove VCPI code (duplicate/tazboot)

diff -r 28e3408ee722 -r de17d022fe9c syslinux/stuff/iso2exe/bootiso.S
--- a/syslinux/stuff/iso2exe/bootiso.S	Sun Mar 26 00:07:11 2017 +0100
+++ b/syslinux/stuff/iso2exe/bootiso.S	Sun Mar 26 15:53:23 2017 +0200
@@ -177,7 +177,7 @@
 	ret
 	.org	0x7E00
 
-	.org	0x7F4E
+	.org	0x7F85
 ////////////////////////////// DOS EXE code ///////////////////////////////////
 
 exestart:
@@ -209,17 +209,17 @@
 is386:
 	smsww	%ax			// not privileged
 	andb	$1, %al
-	movw	$10, %si
-	jne	tstvcpi
+	movb	$EXESTR(vm86modemsg), %al
+	jne	isvm86
 	movl	%cr0, %eax		// privileged
 	incl	%eax
+	.arch	i8086
 	movb	$EXESTR(rmPaging), %al
 	js	abort
 	inc	%ax
 	//movb	$EXESTR(realmodemsg), %al
-realmode:
+isvm86:
 	call	goputs
-	.arch	i8086
 is86:
 	movw	comstart-end_header(%di), %si		// .com address
 	pushw	%di
@@ -228,50 +228,10 @@
 	movsw
 	ret
 
-	.arch	i486
-CallVCPI:
-	int	$0x67
-	testb	%ah, %ah
-	xchgw	%ax, %cx
-	pushw	%si
-ScanVCPI:
-	popw	%si
-ChkVCPI:
-NoVCPI:
-	movb	$EXESTR(ERRvcpi), %al
-	jne	abort
-	lodsb
-	shlw	$8, %ax
-	jne	CallVCPI
-VersionVCPI:
-	xchgw	%ax, %si		// movb	$EXESTR(vm86modemsg), %al
-	cmpb	$0x40, %cl		// EMM386 / VCPI 4.0 mini
-	jnc	realmode		// %si = 0
-tstvcpi:
-	pushw	%ds
-	movw	%si, %ds		// %si = 10
-	movw	(0x67*4)+2-(16*10)-0x100(%di), %ds
-	lodsw
-	xorw	$0x4D45, %ax		// EM(MX) or EM(MQ)
-	lodsw
-	lodsw
-	popw	%ds
-	jne	NoVCPI
-	xorw	$0x5858, %ax		// XX(X0)
-	call	ScanVCPI
-CmdVCPI:
-	.byte	0x40			// status
-	.byte	0xDE			// vcpi present ?
-	.byte	0x46			// version
-	.byte	0
-
 vm86modemsg:
 // --------------- Must be in 7F40 7FFF range ------------------------
 	.ascii	"86"			// 86 mode
 	.byte	EXESTR(mode)
-ERRvcpi:
-	.ascii	"VCPI4"			// VCPI4?
-	.byte	EXESTR(need)
 rmPaging:
 	.ascii	"X"			// Xreal mode
 realmodemsg: