rpms/grub/devel grub-0.97-mactel-kbd.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12264

Modified Files:
	grub-0.97-mactel-kbd.patch 
Log Message:
- fix the patch so it applies... ;)


grub-0.97-mactel-kbd.patch:
 asm.S |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 48 insertions(+), 3 deletions(-)

Index: grub-0.97-mactel-kbd.patch
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub-0.97-mactel-kbd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-0.97-mactel-kbd.patch	12 Jun 2006 20:49:10 -0000	1.2
+++ grub-0.97-mactel-kbd.patch	12 Jun 2006 21:05:36 -0000	1.3
@@ -1,5 +1,5 @@
---- grub-0.97/stage2/asm.S.mactel-kbd	2006-06-12 15:24:41.000000000 -0400
-+++ grub-0.97/stage2/asm.S	2006-06-12 16:35:17.000000000 -0400
+--- grub-0.97/stage2/asm.S.mactel-kbd	2006-06-12 17:00:10.000000000 -0400
++++ grub-0.97/stage2/asm.S	2006-06-12 17:03:38.000000000 -0400
 @@ -1651,7 +1651,30 @@
  	jnz	3f
  	ret
@@ -54,16 +54,14 @@
  	andb	$K_IBUF_FUL, %al
  	jnz	gloop1
  
-@@ -1993,17 +2021,31 @@
- 
+@@ -1994,8 +2022,25 @@
  	call	EXT_C(prot_to_real)
  	.code16
--
+ 
 +.again:
 +	mov	$0x11, %ah		/* poll kbd */
  	int	$0x16
--
--	movw	%ax, %dx		/* real_to_prot uses %eax */
+ 
 +	jz	.again
 +#if 0
 +/* XXX handle serial here? -- pj */
@@ -79,26 +77,24 @@
 +	and	%al, %al
 +	jz	.func_key
 +.func_key:
-+	movw	%ax, %dx		/* real_to_prot uses %eax */
+ 	movw	%ax, %dx		/* real_to_prot uses %eax */
  	call	translate_keycode
  	call	remap_ascii_char
+@@ -2003,7 +2048,7 @@
  	DATA32	call	EXT_C(real_to_prot)
  	.code32
--
+ 
 -	movw	%dx, %ax
-+	mov	%edx, %eax
++	mov	%dx, %ax
  
  	pop	%ebp
  	ret
-@@ -2029,11 +2071,11 @@
+@@ -2029,7 +2074,7 @@
  	call	EXT_C(prot_to_real)	/* enter real mode */
  	.code16
  
 -	movb	$0x1, %ah
 +	movb	$0x11, %ah
  	int	$0x16
-
+ 
  	DATA32	jz	notpending
- 	movw	%ax, %dx
- 	call	translate_keycode
- 	call	remap_ascii_char