From owner-svn-src-user@FreeBSD.ORG  Sun Dec 21 04:40:03 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 40B2E1065673;
	Sun, 21 Dec 2008 04:40:03 +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 2FDC18FC08;
	Sun, 21 Dec 2008 04:40:03 +0000 (UTC)
	(envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBL4e3C1023692;
	Sun, 21 Dec 2008 04:40:03 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBL4e3ED023691;
	Sun, 21 Dec 2008 04:40:03 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <200812210440.mBL4e3ED023691@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Sun, 21 Dec 2008 04:40:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186370 - user/nyan/pc98/sys/boot/pc98/btx/btxldr
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Dec 2008 04:40:03 -0000

Author: nyan
Date: Sun Dec 21 04:40:02 2008
New Revision: 186370
URL: http://svn.freebsd.org/changeset/base/186370

Log:
  MFi386: 185779:185781
  
    Respect RBX_MUTE flag from boot2.

Modified:
  user/nyan/pc98/sys/boot/pc98/btx/btxldr/btxldr.S

Modified: user/nyan/pc98/sys/boot/pc98/btx/btxldr/btxldr.S
==============================================================================
--- user/nyan/pc98/sys/boot/pc98/btx/btxldr/btxldr.S	Sun Dec 21 04:34:20 2008	(r186369)
+++ user/nyan/pc98/sys/boot/pc98/btx/btxldr/btxldr.S	Sun Dec 21 04:40:02 2008	(r186370)
@@ -15,6 +15,9 @@
  * $FreeBSD$
  */
 
+#define	RBX_MUTE	0x10	/* -m */
+#define	OPT_SET(opt)	(1 << (opt))
+
 /*
  * Prototype BTX loader program, written in a couple of hours.  The
  * real thing should probably be more flexible, and in C.
@@ -64,6 +67,8 @@
  */
 start:		cld				# String ops inc
 		cli
+		testl $OPT_SET(RBX_MUTE), 4(%esp) # Check first argument
+		setnz muted			#  for RBX_MUTE, set flag
 gdcwait.1:	inb $0x60,%al
 		testb $0x04,%al
 		jz gdcwait.1
@@ -309,7 +314,9 @@ putstr: 	lodsb				# Load char
 /*
  * Output character AL to the console.
  */
-putchr: 	pusha				# Save
+putchr:		testb $1,muted			# Check muted
+		jnz putchr.5			#  do a nop
+		pusha				# Save
 		xorl %ecx,%ecx			# Zero for loops
 		movb $SCR_MAT,%ah		# Mode/attribute
 		movl $BDA_POS,%ebx		# BDA pointer
@@ -353,7 +360,7 @@ gdcwait.3:	inb $0x60,%al
 		movb %dh,%al
 		outb %al,$0x60
 		popa				# Restore
-		ret				# To caller
+putchr.5:	ret				# To caller
 /*
  * Convert EAX, AX, or AL to hex, saving the result to [EDI].
  */
@@ -418,6 +425,12 @@ m_segs: 	.asciz "text segment: offset="
 		.asciz " memsz=\0\n"
 m_done: 	.asciz "Loading complete\n"
 #endif
+
+/*
+ * Flags
+ */
+muted:		.byte 0x0
+
 /*
  * Uninitialized data area.
  */