grub/patches/grub-0.97-intelmac.patch

--- grub-0.97.orig/stage2/asm.S	2004-06-19 18:55:22.000000000 +0200
+++ grub-0.97/stage2/asm.S	2006-04-21 11:10:52.000000000 +0200
@@ -1651,7 +1651,29 @@
 	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 +1683,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 +1709,8 @@
 
 gloop1:
 	inb	$K_STATUS
+	cmpb	$0xff, %al
+	jz	gloop2ret
 	andb	$K_IBUF_FUL, %al
 	jnz	gloop1
 
@@ -1991,6 +2018,11 @@
 ENTRY(console_getkey)
 	push	%ebp
 
+wait_for_key:
+	call	EXT_C(console_checkkey)
+	incl	%eax
+	jz	wait_for_key
+	
 	call	EXT_C(prot_to_real)
 	.code16
  
1	niro	1053	--- grub-0.97.orig/stage2/asm.S 2004-06-19 18:55:22.000000000 +0200
2			+++ grub-0.97/stage2/asm.S 2006-04-21 11:10:52.000000000 +0200
3			@@ -1651,7 +1651,29 @@
4			jnz 3f
5			ret
6
7			-3: /* use keyboard controller */
8			+3: /*
9			+ * try to switch gateA20 using PORT92, the "Fast A20 and Init"
10			+ * register
11			+ */
12			+ mov $0x92, %dx
13			+ inb %dx, %al
14			+ /* skip the port92 code if it's unimplemented (read returns 0xff) */
15			+ cmpb $0xff, %al
16			+ jz 6f
17			+
18			+ /* set or clear bit1, the ALT_A20_GATE bit */
19			+ movb 4(%esp), %ah
20			+ testb %ah, %ah
21			+ jz 4f
22			+ orb $2, %al
23			+ jmp 5f
24			+4: and $0xfd, %al
25			+
26			+ /* clear the INIT_NOW bit don't accidently reset the machine */
27			+5: and $0xfe, %al
28			+ outb %al, %dx
29			+
30			+6: /* use keyboard controller */
31			pushl %eax
32
33			call gloop1
34			@@ -1661,9 +1683,12 @@
35
36			gloopint1:
37			inb $K_STATUS
38			+ cmpb $0xff, %al
39			+ jz gloopint1_done
40			andb $K_IBUF_FUL, %al
41			jnz gloopint1
42
43			+gloopint1_done:
44			movb $KB_OUTPUT_MASK, %al
45			cmpb $0, 0x8(%esp)
46			jz gdoit
47			@@ -1684,6 +1709,8 @@
48
49			gloop1:
50			inb $K_STATUS
51			+ cmpb $0xff, %al
52			+ jz gloop2ret
53			andb $K_IBUF_FUL, %al
54			jnz gloop1
55
56			@@ -1991,6 +2018,11 @@
57			ENTRY(console_getkey)
58			push %ebp
59
60			+wait_for_key:
61			+ call EXT_C(console_checkkey)
62			+ incl %eax
63			+ jz wait_for_key
64			+
65			call EXT_C(prot_to_real)
66			.code16
67