From owner-svn-src-stable-6@FreeBSD.ORG  Tue Dec 29 04:34:40 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 184011065670;
	Tue, 29 Dec 2009 04:34:40 +0000 (UTC)
	(envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 03C488FC12;
	Tue, 29 Dec 2009 04:34:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBT4YdQq010780;
	Tue, 29 Dec 2009 04:34:39 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBT4YdcE010778;
	Tue, 29 Dec 2009 04:34:39 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <200912290434.nBT4YdcE010778@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Tue, 29 Dec 2009 04:34:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201154 - stable/6/sys/boot/pc98/kgzldr
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Dec 2009 04:34:40 -0000

Author: nyan
Date: Tue Dec 29 04:34:39 2009
New Revision: 201154
URL: http://svn.freebsd.org/changeset/base/201154

Log:
  MFC: revision 200776
  
    Move cursor position after putting a character.

Modified:
  stable/6/sys/boot/pc98/kgzldr/crt.s
Directory Properties:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/boot/pc98/kgzldr/crt.s
==============================================================================
--- stable/6/sys/boot/pc98/kgzldr/crt.s	Tue Dec 29 04:29:38 2009	(r201153)
+++ stable/6/sys/boot/pc98/kgzldr/crt.s	Tue Dec 29 04:34:39 2009	(r201154)
@@ -75,5 +75,15 @@ crt_putchr.3:	cmpw $SCR_ROW*SCR_COL*2,%d
 		stosw				#  line
 		movw $(SCR_ROW-1)*SCR_COL*2,%dx
 crt_putchr.4:	movw %dx,(%ebx) 		# Update position
+		shrw $1,%dx
+crt_putchr.5:	inb $0x60,%al			# Move cursor
+		testb $0x04,%al
+		jz crt_putchr.5
+		movb $0x49,%al
+		outb %al,$0x62
+		movb %dl,%al
+		outb %al,$0x60
+		movb %dh,%al
+		outb %al,$0x60
 		popa				# Restore
 		ret				# To caller