grub-0.97-patch1-startups

grub for dos ,people can use it in dos for calling linux

diff -Naur grub-0.97/ChangeLog grub-0.97_startups/ChangeLog
--- grub-0.97/ChangeLog	2005-05-08 10:47:02.000000000 +0800
+++ grub-0.97_startups/ChangeLog	2006-10-24 12:28:50.000000000 +0800
@@ -1,3 +1,23 @@
[phone]
+
+	From Tinybit  <[e-mail]>:
+	For booting via DOS/NTLDR:
+	* stage2/Makefile.am: added items for GRLDR, GRUB.EXE and GRUB4LIN
+
+	* stage2/grldrstart.S: (new file) startup code for GRLDR(boot via NT)
+
+	* stage2/dosstart.S: (new file) startup code for GRUB.EXE(boot via DOS)
+
+	* stage2/bootlacestart.S: (new file) startup code for BOOTLACE.COM
+
+	* stage2/edd.S: (new file) for being included by dosstart.S
+
+	* stage2/video.S: (new file) for being included by dosstart.S
+
+	* stage2/asm: (new dir) contains header files for dosstart.S
+
+	* stage2/linux: (new dir) contains header files for dosstart.S
+
 2005-05-08  Yoshinori K. Okuji  <[e-mail]>
 
 	* configure.ac (AC_INIT): Upgraded to 0.97.
diff -Naur grub-0.97/stage2/a20.inc grub-0.97_startups/stage2/a20.inc
--- grub-0.97/stage2/a20.inc	1970-01-01 08:00:00.000000000 +0800
+++ grub-0.97_startups/stage2/a20.inc	2006-10-24 12:28:50.000000000 +0800
@@ -0,0 +1,444 @@
+enable_disable_a20:
+
+	###################################################################
+	# Thanks to `A20 - a pain from the past' from url:
+	# http://www.win.tue.nl/~aeb/linux/kbd/A20.html
+	###################################################################
+
+	###################################################################
+	# Thanks to Chris Giese <[e-mail]> for this code:
+	# http://my.execpc.com/CE/AC/geezer/osd/boot/a20.asm
+	###################################################################
+
+	###################################################################
+	# input:	DL=0		disable a20
+	#		DL=non-zero	enable a20
+	#		DH=0		don't reset keyboard controller
+	#		DH=non-zero	reset keyboard controller
+	#		CX=loops to try when failure
+	#
+	# output:	ZF=0		failed
+	#		ZF=1		completed ok. If ZF=CF=1, then
+        #				the A20 status needn't change and
+	#				was not touched.
+	#		EAX modified
+	#		CX modified
+	###################################################################
+#if 1
+	pushfw				/* save old IF */
+
+	/* oh, in case we are in real mode, disable interrupt since we will
+	 * touch the int0 vector.
+	 */
+
+	cli
+
+	/* disable CPU cache for the test to work reliably. */
+	movl	%cr0, %eax
+	pushl	%eax			/* save old cr0 */
+//	andl	$0x00000011, %eax
+	orl	$0x60000000, %eax	/* set CD and NW */
+	movl	%eax, %cr0
+	movl	%cr0, %eax
+	testl	$0x60000000, %eax	/* check if we can use wbinvd. */
+	jz	1f			/* CPU has no wbinvd instruction. */
+	wbinvd
+	andl	$0xDFFFFFFF, %eax	/* clear NW */
+	movl	%eax, %cr0
+1:
+#endif
+3:
+	# First, see if the A20 status is already what we desired.
+
+	call	a20_test_match
+	/* ZF=1(means equal) for desired and we needn't do anything. */
+	stc		/* ZF=CF=1 indicates nothing needs to be done. */
+	jz	3f
+	//jnz	3f
+
+	# Try ELAN before the BIOS call
+
+#if defined(CONFIG_X86_ELAN) || 1
+
+#if 0	// bad! this would hurt some PCs like the DELL machines
+	testb	%dl, %dl
+	setnz	%al
+	shlb	$1, %al
+	//movb	$0x02, %al			# alternate A20 gate
+	outb	%al, $0x92			# this works on SC410/SC520
+
+	call	a20_test_loop
+	jz	3f
+
+#else	// hopefully this wouldn't conflict with other PCs
+
+	# Try another ELAN method: Use "inb 0xee" to control A20.
+	# H. Peter Anvin and Christer Weinigel talked about this at(googled):
+	# http://www.ussg.iu.edu/hypermail/linux/kernel/0201.0/0128.html
+
+	# Alternate Gate A20 Control Register (Port 00EEh) A special 8-bit
+	# read/write control register provides a fast and reliable way to
+	# control the CPU A20 signal. A dummy read of this register returns
+	# a value of FFh and forces the CPU A20 to propagate to the core
+	# logic, while a dummy write to this register will cause the CPU A20
+	# signal to be forced Low as long as no other A20 gate control
+	# sources are forcing the CPU A20 signal to propagate.
+#if 1
+	testb	%dl, %dl
+	jz	1f
+	inb	$0xEE, %al
+	jmp	2f
+1:
+	xorb	%al, %al
+	outb	%al, $0xEE
+2:
+	call	a20_test_loop
+	jz	3f
+	//jnz	3f
+
+#endif
+#endif
+#endif
+
+	# Try the BIOS call(INT 0x15, AX=0x240x)
+
+	testb	%dl, %dl
+	setnz	%al
+	movb	$0x24, %ah
+	pushfl					# Be paranoid about flags
+	pushal
+	int	$0x15
+	popal
+	popfl
+
+	call	a20_test_match
+	jz	3f
+	//jnz	3f
+
+	# Try the keyboard controller
+
+	call	empty_8042	# clear output buffer and wait until
+       				# input buffer is empty	
+
+	call	a20_test_match	# Just in case the BIOS worked
+	jz	3f		# but had a delayed reaction.
+
+	pushfw
+
+	cli
+
+	# first, get the keyboard controller output status
+	
+	movb	$0xD0, %al	# 8042 command byte to read output port
+	outb	%al, $0x64	# write command to port 64h
+	call	delay
+	
+	pushw	%cx
+	
+	xorw	%cx, %cx	# try 65536 times
+1:	
+	inb	$0x64, %al	# get 8042 status
+	testb	$1, %al		# output buffer (data _from_ keyboard) full?
+	loopz	1b		# no, loop
+
+	popw	%cx
+
+	# wait at least 7 microseconds for MCA type 1 controller
+	
+	call	delay
+	call	delay
+	call	delay
+	call	delay
+	call	delay
+	call	delay
+	call	delay
+	
+	# safe to read data
+	
+	inb	$0x60, %al	# read output port
+	andb	$0xFD, %al	# clear bit 1
+	testb	%dl, %dl
+	setne	%ah
+	shlb	$1, %ah
+	orb	%al, %ah
+
+	call	empty_8042
+	
+	movb	$0xD1, %al	# 8042 command byte to write output port
+	outb	%al, $0x64	# write command to port 64h
+	call	delay
+	call	empty_8042
+	
+	movb	%ah, %al	# the value to write: 0xDF for a20 on,
+				# and 0xDD for a20 off.
+	outb	%al, $0x60
+
+	popfw
+
+#if 0
+	call	empty_8042
+
+	/* output a dummy command (USB keyboard hack) */
+	movb	$0xff, %al
+	outb	%al, $0x64
+	call	delay
+#endif
+
+	# Wait until a20 really *is* enabled; it can take a fair amount of
+	# time on certain systems; Toshiba Tecras are known to have this
+	# problem.
+
+	call	empty_8042
+	
+	call	a20_test_loop
+	jz	3f
+
+	# Try the shortcut HP Vectra method
+
+	pushfw
+
+	cli
+
+	# 0xDD is for disable and 0xDF is for enable
+
+	testb	%dl, %dl
+	setne	%al
+	shlb	$1, %al
+	orb	$0xDD, %al
+	outb	%al, $0x64
+
+	popfw
+
+	call	empty_8042
+
+	call	a20_test_loop
+	jz	3f
+
+	# Final attempt: use "configuration port A"
+
+	inb	$0x92, %al	# Configuration Port A
+	testb	%dl, %dl
+	jz	2f		# we want to disable a20
+	testb	$0x02, %al
+	jnz	1f		# chipset bug: do nothing if already set
+	orb	$0x02, %al	# "fast A20" version
+	andb	$0xFE, %al	# don't accidentally reset the cpu
+	jmp	0f
+2:
+	testb	$0x02, %al
+	jz	1f		# chipset bug: do nothing if already cleared
+	andb	$0xFC, %al	# don't accidentally reset the cpu
+0:
+	outb	%al, $0x92
+1:
+	# Wait for configuration port A to take effect
+
+	call	a20_test_loop
+	jz	3f
+
+	# A20 is still not responding.  Try frobbing it again.
+
+	decw	%cx
+	jnz	3b
+
+	# right now CX=0, ZF=1
+
+	decw	%cx		# just let ZF=0
+
+	# failure, ZF=0 at this point
+
+3:
+
+#if 1
+	pushfw
+	
+	cli
+	
+	call	empty_8042
+
+#if 0	
+	testb	%dh, %dh
+	jz	1f
+	
+	# try to activate usb keyboard by disable and enable keyboard
+
+	/* 8042 self test */
+	movb	$0xAA, %al
+	outb	%al, $0x64
+	call	delay
+	
+	call	empty_8042
+
+	/* disable keyboard */
+	movb	$0xAD, %al
+	outb	%al, $0x64
+	call	delay
+	
+	call	empty_8042
+
+	/* enable keyboard */
+	movb	$0xAE, %al
+	outb	%al, $0x64
+	call	delay
+	
+	call	empty_8042
+
+	/* write command byte */
+	movb	$0x60, %al
+	outb	%al, $0x64
+	call	delay
+	
+	call	empty_8042
+
+	movb	$0x45, %al	# enable IRQ1, turn on keyboard
+	outb	%al, $0x60
+
+	call	empty_8042
+
+	movb	$0xF4, %al	# enable keyboard
+	outb	%al, $0x60
+
+	call	empty_8042
+
+	movb	$0xFF, %al	# restart keyboard
+	outb	%al, $0x60
+
+	call	empty_8042
+
+1:
+#endif
+
+	/* output a dummy command (USB keyboard hack) */
+	/* it may also be a keyboard-reset command according to
+	 *   http://www.phys.uu.nl/~0307467/docs/keyboa~2.txt
+	 * where it says:
+	 *   0FFh	Reset the keyboard and start internal diagnostics
+	 */
+	movb	$0xff, %al
+	outb	%al, $0x64
+	call	delay
+	
+	call	empty_8042
+//1:
+	popfw
+#endif
+
+#if 1
+	popl	%eax			/* restore cr0 */
+	movl	%eax, %cr0
+
+	lahf				/* Load Flags into AH Register. */
+					/* AH = SF:ZF:xx:AF:xx:PF:xx:CF */
+	
+	popfw				/* restore IF */
+	sahf				/* update ZF */
+#endif
+	ret
+
+a20_test_loop:
+	pushw	%cx
+	xorw	%cx, %cx
+1:
+	call	a20_test_match
+	jz	2f
+	loop	1b
+2:
+	/* ZF=1(means equal) for match */
+	popw	%cx
+	ret
+
+
+a20_test_match:
+	call	a20_test
+	sete	%al		/* save ZF to AL */
+	testb	%dl, %dl
+	sete	%ah		/* save ZF to AH */
+	cmpb	%al, %ah
+	/* ZF=1(means equal) for match */
+	ret
+
+
+# This routine tests whether or not A20 is enabled.  If so, it
+# exits with zf = 0.
+#
+
+a20_test:
+	pushl	%eax
+	pushw	%ds
+	pushw	%es
+	xorw	%ax, %ax
+	movw	%ax, %ds		/* DS=0 */
+	decw	%ax
+	movw	%ax, %es		/* ES=0xFFFF */
+
+	movl	0, %eax
+	pushl	%eax			/* save old int0 vector */
+
+	cmpl	%es:0x10, %eax
+	jne	1f			/* A20 is on */
+
+	notl	0
+	movl	0, %eax
+	cmpl	%es:0x10, %eax
+	notl	0			/* logical `NOT' won't touch flags */
+1:
+	/* ZF=0(means not equal) for A20 on, ZF=1(means equal) for A20 off. */
+
+	popl	%eax			/* restore int0 vector */
+	movl	%eax, 0
+	popw	%es
+	popw	%ds
+
+	popl	%eax
+	ret
+
+# This routine checks that the keyboard command queue is empty
+# (after emptying the output buffers)
+#
+# Some machines have delusions that the keyboard buffer is always full
+# with no keyboard attached...
+#
+# If there is no keyboard controller, we will usually get 0xff
+# to all the reads.  With each IO taking a microsecond and
+# a timeout of 100,000 iterations, this can take about half a
+# second ("delay" == outb to port 0x80). That should be ok,
+# and should also be plenty of time for a real keyboard controller
+# to empty.
+#
+
+empty_8042:
+	pushl	%ecx
+	//xorw	%cx, %cx	
+	movl	$100000, %ecx	# use 1000 instead of 100000 iterations
+
+3:
+	//call	delay
+
+	inb	$0x64, %al	# read 8042 status from port 64h
+	testb	$1, %al		# is output buffer(data _from_ keyboard) full?
+	jnz	1f		# yes, read it and discard
+	testb	$2, %al		# is input buffer(data _to_ keyboard) empty?
+	jnz	2f		# no, wait until time out
+	jmp	3f		# both input buffer and output buffer are empty
+				# success and return
+1:
+	//call	delay
+	inb	$0x60, %al	# read output buffer and discard data/status from 8042
+2:
+	ADDR32 loop	3b
+
+	# timed out and failure, return 
+3:
+	popl	%ecx
+	ret
+
+# Delay is needed after doing I/O
+delay:
+//	outb	%al, $0x80
+	pushw	%cx
+	movw	$0x0800, %cx	#; 0x2000
+1:
+	loop	1b
+	popw	%cx
+	ret
+
diff -Naur grub-0.97/stage2/asm/boot.h grub-0.97_startups/stage2/asm/boot.h
--- grub-0.97/stage2/asm/boot.h	1970-01-01 08:00:00.000000000 +0800
+++ grub-0.97_startups/stage2/asm/boot.h	2006-10-24 12:28:50.000000000 +0800
@@ -0,0 +1,15 @@
+#ifndef _LINUX_BOOT_H
+#define _LINUX_BOOT_H
+
+/* Don't touch these, unless you really know what you're doing. */
+#define DEF_INITSEG	0x9000
+#define DEF_SYSSEG	0x1000
+#define DEF_SETUPSEG	0x9020
+#define DEF_SYSSIZE	0x7F00
+
+/* Internal svga startup constants */
+#define NORMAL_VGA	0xffff		/* 80x25 mode */
+#define EXTENDED_VGA	0xfffe		/* 80x50 mode */
+#define ASK_VGA		0xfffd		/* ask for it at bootup */
+
+#endif
diff -Naur grub-0.97/stage2/asm/e820.h grub-0.97_startups/stage2/asm/e820.h
--- grub-0.97/stage2/asm/e820.h	1970-01-01 08:00:00.000000000 +0800
+++ grub-0.97_startups/stage2/asm/e820.h	2006-10-24 12:28:50.000000000 +0800
@@ -0,0 +1,40 @@
+/*
+ * structures and definitions for the int 15, ax=e820 memory map
+ * scheme.
+ *
+ * In a nutshell, arch/i386/boot/setup.S populates a scratch table
+ * in the empty_zero_block that contains a list of usable address/size
+ * duples.   In arch/i386/kernel/setup.c, this information is
+ * transferred into the e820map, and in arch/i386/mm/init.c, that
+ * new information is used to mark pages reserved or not.
+ *
+ */
+#ifndef __E820_HEADER
+#define __E820_HEADER
+
+#define E820MAP	0x2d0		/* our map */
+#define E820MAX	128		/* number of entries in E820MAP */
+#define E820NR	0x1e8		/* # entries in E820MAP */
+
+#define E820_RAM	1
+#define E820_RESERVED	2
+#define E820_ACPI	3 /* usable as RAM once ACPI tables have been read */
+#define E820_NVS	4
+
+#define HIGH_MEMORY	(1024*1024)
+
+#ifndef __ASSEMBLY__
+
+struct e820map {
+    int nr_map;
+    struct e820entry {
+	unsigned long long addr;	/* start of memory segment */
+	unsigned long long size;	/* size of memory segment */
+	unsigned long type;		/* type of memory segment */
+    } map[E820MAX];
+};
+
+extern struct e820map e820;
+#endif/*!__ASSEMBLY__*/
+
+#endif/*__E820_HEADER*/
diff -Naur grub-0.97/stage2/asm/linkage.h grub-0.97_startups/stage2/asm/linkage.h
--- grub-0.97/stage2/asm/linkage.h	1970-01-01 08:00:00.000000000 +0800
+++ grub-0.97_startups/stage2/asm/linkage.h	2006-10-24 12:28:50.000000000 +0800
@@ -0,0 +1,13 @@
+#ifndef __ASM_LINKAGE_H
+#define __ASM_LINKAGE_H
+
+#define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))
+#define FASTCALL(x)	x __attribute__((regparm(3)))
+#define fastcall	__attribute__((regparm(3)))
+
+#ifdef CONFIG_X86_ALIGNMENT_16
+#define __ALIGN .align 16,0x90
+#define __ALIGN_STR ".align 16,0x90"
+#endif
+
+#endif
diff -Naur grub-0.97/stage2/asm/page.h grub-0.97_startups/stage2/asm/page.h
--- grub-0.97/stage2/asm/page.h	1970-01-01 08:00:00.000000000 +0800
+++ grub-0.97_startups/stage2/asm/page.h	2006-10-24 12:28:50.000000000 +0800
@@ -0,0 +1,159 @@
+#ifndef _I386_PAGE_H
+#define _I386_PAGE_H
+
+/* PAGE_SHIFT determines the page size */
+#define PAGE_SHIFT	12
+#define PAGE_SIZE	(1UL << PAGE_SHIFT)
+#define PAGE_MASK	(~(PAGE_SIZE-1))
+
+#define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
+#define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)
+
+#ifdef __KERNEL__
+#ifndef __ASSEMBLY__
+
+#include <linux/config.h>
+
+#ifdef CONFIG_X86_USE_3DNOW
+
+#include <asm/mmx.h>
+
+#define clear_page(page)	mmx_clear_page((void *)(page))
+#define copy_page(to,from)	mmx_copy_page(to,from)