SliTaz Repositories

     1.1 --- a/memtest/stuff/memtest86+-5.01-setup.patch	Sat Jun 04 10:10:15 2016 +0200
     1.2 +++ b/memtest/stuff/memtest86+-5.01-setup.patch	Fri Dec 16 10:45:18 2016 +0100
     1.3 @@ -1,19 +1,20 @@
     1.4  --- memtest86+-5.01/setup.S
     1.5  +++ memtest86+-5.01/setup.S
     1.6 -@@ -27,11 +27,10 @@
     1.7 +@@ -27,11 +27,11 @@
     1.8   #ljmp	$INITSEG, $(reload - start + 0x200)
     1.9   reload:
    1.10   	movw	$INITSEG, %ax
    1.11  -	movw	%ax, %ds
    1.12   	movw	%ax, %es
    1.13   	movw	%ax, %fs
    1.14 ++	movw	%ax, %gs
    1.15   	movw	%ax, %ss	# reset the stack to INITSEG:0x4000-12.
    1.16  -	movw	%dx, %sp
    1.17  +	movw	$0x4000-12, %sp
    1.18   	push	%cs
    1.19   	pop	%ds
    1.20   	lidt	idt_48 - start	# load idt with 0,0
    1.21 -@@ -50,13 +49,13 @@
    1.22 +@@ -50,13 +50,13 @@
    1.23        	jz	alt_a20_done
    1.24        	
    1.25        	/* set or clear bit1, the ALT_A20_GATE bit */
    1.26 @@ -32,13 +33,37 @@
    1.27   
    1.28   	/* clear the INIT_NOW bit; don't accidently reset the machine */
    1.29   alt_a20_cont2:
    1.30 -@@ -87,8 +86,8 @@
    1.31 +@@ -87,9 +87,9 @@
    1.32   	movw	$KERNEL_DS, %ax
    1.33   	movw	%ax, %ds
    1.34   	movw	%ax, %es
    1.35  -	movw	%ax, %ss
    1.36   	movw	%ax, %fs
    1.37 + 	movw	%ax, %gs
    1.38  +	movw	%ax, %ss
    1.39 - 	movw	%ax, %gs
    1.40   
    1.41   data32	ljmp	$KERNEL_CS, $(TSTLOAD <<4)	# jmp offset 2000 of segment 0x10 (cs)
    1.42 + 
    1.43 +@@ -100,18 +100,16 @@
    1.44 +  * No timeout is used - if this hangs there is something wrong with
    1.45 +  * the machine, and we probably couldn't proceed anyway.
    1.46 +  */
    1.47 ++has_output:
    1.48 ++	call	delay
    1.49 ++	inb	$0x60, %al	# read it
    1.50 + empty_8042:
    1.51 + 	call	delay
    1.52 + 	inb	$0x64, %al	# 8042 status port
    1.53 + 	cmpb	$0xff, %al	# from grub-a20-patch, skip if not impl
    1.54 + 	jz	empty_8042_ret
    1.55 + 	testb	$1, %al		# output buffer?
    1.56 +-	jz	no_output
    1.57 +-	call	delay
    1.58 +-	inb	$0x60, %al	# read it
    1.59 +-	jmp	empty_8042
    1.60 +-	
    1.61 +-no_output:
    1.62 ++	jnz	has_output
    1.63 + 	testb	$2, %al		# is input buffer full?
    1.64 + 	jnz	empty_8042	# yes - loop
    1.65 + empty_8042_ret: