rpms/grub/devel grub-0.97-mactel-kbd.patch, NONE, 1.1 grub.spec, 1.40, 1.41

[fedora-cvs-commits at redhat.com]

Author: pjones

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

Modified Files:
	grub.spec 
Added Files:
	grub-0.97-mactel-kbd.patch 
Log Message:
- fix mactel keyboard issues

grub-0.97-mactel-kbd.patch:
 asm.S |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletion(-)

--- NEW FILE grub-0.97-mactel-kbd.patch ---
--- grub-0.97/stage2/asm.S.mactel-kbd	2006-05-27 13:13:47.000000000 -0400
+++ grub-0.97/stage2/asm.S	2006-05-27 13:15:52.000000000 -0400
@@ -1651,7 +1651,30 @@
 	jnz	3f
 	ret
 
-3:	/* use keyboard controller */
+3:	/*
+	* try to switch gateA20 using PORT92, the "Fast A20 and Init"
+	* register
+	*/
+	mov	$0x92, %dx
+	inb	%dx, %al
+	/* skip the port92 code if it's unimplemented (read returns 0xff) */
+	cmpb	$0xff, %al
+	jz	6f
+
+	/* set or clear bit1, the ALT_A20_GATE bit */
+	movb	4(%esp), %ah
+	testb	%ah, %ah
+	jz	4f
+	orb	$2, %al
+	jmp	5f
+4:	and	$0xfd, %al
+
+	/* clear the INIT_NOW bit; don't accidently reset the machine */
+5:	and	$0xfe, %al
+	outb	%al, %dx
+
+
+6:	/* use keyboard controller */
 	pushl	%eax
 
 	call    gloop1
@@ -1661,9 +1684,12 @@
 
 gloopint1:
 	inb	$K_STATUS
+	cmpb	$0xff, %al
+	jz	gloopint1_done
 	andb	$K_IBUF_FUL, %al
 	jnz	gloopint1
 
+gloopint1_done:
 	movb	$KB_OUTPUT_MASK, %al
 	cmpb	$0, 0x8(%esp)
 	jz	gdoit
@@ -1684,6 +1710,8 @@
 
 gloop1:
 	inb	$K_STATUS
+	cmpb	$0xff, %al
+	jz	gloop2ret
 	andb	$K_IBUF_FUL, %al
 	jnz	gloop1
 


Index: grub.spec
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- grub.spec	13 Mar 2006 22:44:34 -0000	1.40
+++ grub.spec	27 May 2006 17:22:08 -0000	1.41
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 5
+Release: 6
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPL
@@ -98,6 +98,9 @@
 Patch1146: grub-0.97-dmraid-recheck-bad.patch
 Patch1147: grub-0.97-dmraid-partition-names.patch
 
+# fix mactel keyboard bugs
+Patch1148: grub-0.97-mactel-kbd.patch
+
 ExclusiveArch: i386 x86_64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, texinfo
 BuildRequires: automake
@@ -171,6 +174,8 @@
 %patch1146 -p1 -b .dmraid-recheck-bad
 %patch1147 -p1 -b .dmraid-partition-names
 
+%patch1148 -p1 -b .mactel-kbd
+
 %build
 autoreconf --install --force
 GCCVERS=$(gcc --version | head -1 | cut -d\  -f3 | cut -d. -f1)
@@ -222,6 +227,9 @@
 %{_datadir}/grub
 
 %changelog
+* Sat May 27 2006 Peter Jones <pjones at redhat.com> - 0.97-6
+- Fix mactel keyboard problems, patch from Juergen Keil, forwarded by Linus.
+
 * Mon Mar 13 2006 Peter Jones <pjones at redhat.com> - 0.97-5
 - Fix merge error for "bootonce" patch (broken in 0.95->0.97 update)
 - Get rid of the 0.97 "default" stuff, since it conflicts with our working