From owner-cvs-all@FreeBSD.ORG  Wed Jun  2 09:36:26 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 585E216A4CF
	for <cvs-all@FreeBSD.org>; Wed,  2 Jun 2004 09:36:26 -0700 (PDT)
Received: from root.org (root.org [67.118.192.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id A60E343D5E
	for <cvs-all@FreeBSD.org>; Wed,  2 Jun 2004 09:36:25 -0700 (PDT)
	(envelope-from nate@root.org)
Received: (qmail 35574 invoked by uid 1000); 2 Jun 2004 16:36:20 -0000
Date: Wed, 2 Jun 2004 09:36:20 -0700 (PDT)
From: Nate Lawson <nate@root.org>
To: Poul-Henning Kamp <phk@FreeBSD.org>
In-Reply-To: <20040602093847.D53A516A520@hub.freebsd.org>
Message-ID: <20040602093149.D35427@root.org>
References: <20040602093847.D53A516A520@hub.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/boot/i386/boot2 boot1.S
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jun 2004 16:36:26 -0000

On Wed, 2 Jun 2004, Poul-Henning Kamp wrote:
> phk         2004/06/02 02:38:33 PDT
>
>   FreeBSD src repository
>
>   Modified files:
>     sys/boot/i386/boot2  boot1.S
>   Log:
>   Some embedded platforms have no keyboard controller.  Give up waiting
>   for it to react after a timeout.
>
>   Revision  Changes    Path
>   1.28      +11 -4     src/sys/boot/i386/boot2/boot1.S
>
> --- src/sys/boot/i386/boot2/boot1.S:1.27	Fri May 14 13:29:29 2004
> +++ src/sys/boot/i386/boot2/boot1.S	Wed Jun  2 02:38:32 2004
> @@ -197,13 +197,16 @@
>  		xorb %al,%al			# Zero assumed bss from
>  		rep				#  the end of boot2.bin
>  		stosb				#  up to 0x10000
> -		callw seta20			# Enable A20
> -		jmp start+MEM_JMP-MEM_ORG	# Start BTX
> +

By removing the callw/retw and moving the jmp to the end, A20 enable can't
be called as a subroutine from elsewhere.  Will it be needed elsewhere?

>  /*
>   * Enable A20 so we can access memory above 1 meg.
> + * Use the zero-valued %cx as a timeout for embedded hardware which do not
> + * have a keyboard controller.
>   */
>  seta20: 	cli				# Disable interrupts
> -seta20.1:	inb $0x64,%al			# Get status

Should be a "movw TIMEOUT, %cx" here.  (Or whatever the timeout constant
is.)

> +seta20.1:	dec %cx				# Timeout?
> +		jz seta20.3			# Yes
> +		inb $0x64,%al			# Get status
>  		testb $0x2,%al			# Busy?
>  		jnz seta20.1			# Yes
>  		movb $0xd1,%al			# Command: Write

-Nate