wok diff syslinux/stuff/iso2exe/bootloader.S @ rev 21824

syslinux/taziso: floppy by floppy fallback
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Sep 10 09:01:01 2019 +0200 (2019-09-10)
parents 13835bce7189
children
line diff
     1.1 --- a/syslinux/stuff/iso2exe/bootloader.S	Fri Jun 26 09:27:39 2015 +0200
     1.2 +++ b/syslinux/stuff/iso2exe/bootloader.S	Tue Sep 10 09:01:01 2019 +0200
     1.3 @@ -146,10 +146,10 @@
     1.4  # Only characters before the cursor are passed to the kernel.
     1.5  
     1.6  	xorw	%si, %si
     1.7 -	orw	cmd_line_ptr-7(%bx), %si
     1.8 +	orw	(%bx), %si
     1.9  	jz	nocmdline
    1.10  #ifdef OLDCMDLINE
    1.11 -	movw	$0xA33F, cmd_line_ptr-2-7(%bx)
    1.12 +	movw	$0xA33F, -2(%bx)
    1.13  #endif
    1.14  	call	puts
    1.15  #ifdef	EDIT_CMDLINE
    1.16 @@ -165,14 +165,14 @@
    1.17  	call	wait4key
    1.18  #else
    1.19  	int	$0x16
    1.20 +	cbw				# %ah = 0, get keyboard character
    1.21  #endif
    1.22 -	cbw				# %ah = 0, get keyboard character
    1.23  	cmpb	$8, %al			# BackSpace ?
    1.24  	je	cmdbs
    1.25  	movb	%al, (%si)		# store char
    1.26  	lodsw				# %si += 2
    1.27  cmdbs:
    1.28 -	cmpw	%si, cmd_line_ptr-7(%bx)
    1.29 +	cmpw	%si, (%bx)
    1.30  	je	cmdget
    1.31  	call	putc
    1.32  	cmpb	$10, %al		# Enter/linefeed ?
    1.33 @@ -185,7 +185,7 @@
    1.34  	popw	%es
    1.35  	movw	$0x8000, %di
    1.36  	movw	%di, %si
    1.37 -	xchgw	%si, cmd_line_ptr-7(%bx)
    1.38 +	xchgw	%si, (%bx)
    1.39  	movb	$0x2, %ch
    1.40  	rep
    1.41  	  movsb
    1.42 @@ -378,8 +378,10 @@
    1.43  
    1.44  check_limits:
    1.45  	popw	%dx
    1.46 -        cmpb    %al, %cl		# max sector known ?
    1.47 -        ja	next_head		#   no -> store it
    1.48 +        cmpb    %cl, %al		# max sector known ?
    1.49 +        jbe	next_head		#   no -> store it
    1.50 +	#.byte	0xd6	# SALC		# sector by sector
    1.51 +	movb	$0, %al			# sector by sector
    1.52  	pushaw
    1.53          int     $0x13			# reset controler
    1.54  	stc
    1.55 @@ -483,6 +485,9 @@
    1.56   	int	$0x10
    1.57  	cmp	$0xd, %al		# CR ?
    1.58  	je	putclf
    1.59 +#ifdef	CMDLINE_SUPPORT
    1.60 +	movb	$cmd_line_ptr, %bl
    1.61 +#endif
    1.62  	ret
    1.63  
    1.64  #ifdef KEYBOARDLESS_SUPPORT