From owner-svn-src-stable-9@FreeBSD.ORG Fri Nov 23 13:09:20 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id D6CB6FFB;
Fri, 23 Nov 2012 13:09:20 +0000 (UTC)
(envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id A176D8FC12;
Fri, 23 Nov 2012 13:09:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAND9KDA018636;
Fri, 23 Nov 2012 13:09:20 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAND9K9t018633;
Fri, 23 Nov 2012 13:09:20 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <201211231309.qAND9K9t018633@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Fri, 23 Nov 2012 13:09:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243445 - in stable/9/sys/boot/pc98: boot2 btx/btx
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>,
<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>,
<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Nov 2012 13:09:21 -0000
Author: nyan
Date: Fri Nov 23 13:09:20 2012
New Revision: 243445
URL: http://svnweb.freebsd.org/changeset/base/243445
Log:
MFC: r242863
add detection of serial console presence to btx and boot2-like blocks.
Modified:
stable/9/sys/boot/pc98/boot2/boot2.c
stable/9/sys/boot/pc98/btx/btx/btx.S
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/boot/ (props changed)
Modified: stable/9/sys/boot/pc98/boot2/boot2.c
==============================================================================
--- stable/9/sys/boot/pc98/boot2/boot2.c Fri Nov 23 13:04:38 2012 (r243444)
+++ stable/9/sys/boot/pc98/boot2/boot2.c Fri Nov 23 13:09:20 2012 (r243445)
@@ -555,8 +555,10 @@ parse()
}
ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) :
OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD;
- if (ioctrl & IO_SERIAL)
- sio_init(115200 / comspeed);
+ if (ioctrl & IO_SERIAL) {
+ if (sio_init(115200 / comspeed) != 0)
+ ioctrl &= ~IO_SERIAL;
+ }
} else {
for (q = arg--; *q && *q != '('; q++);
if (*q) {
Modified: stable/9/sys/boot/pc98/btx/btx/btx.S
==============================================================================
--- stable/9/sys/boot/pc98/btx/btx/btx.S Fri Nov 23 13:04:38 2012 (r243444)
+++ stable/9/sys/boot/pc98/btx/btx/btx.S Fri Nov 23 13:09:20 2012 (r243445)
@@ -840,7 +840,7 @@ putstr: lodsb # Load char
.set SIO_DIV,(115200/SIOSPD) # 115200 / SPD
/*
- * void sio_init(void)
+ * int sio_init(void)
*/
sio_init: movw $SIO_PRT+0x3,%dx # Data format reg
movb $SIO_FMT|0x80,%al # Set format
@@ -856,14 +856,19 @@ sio_init: movw $SIO_PRT+0x3,%dx # Data
movb $0x3,%al # Set RTS,
outb %al,(%dx) # DTR
incl %edx # Line status reg
+ call sio_getc.1 # Get character
/*
- * void sio_flush(void)
+ * int sio_flush(void)
*/
-sio_flush.0: call sio_getc.1 # Get character
-sio_flush: call sio_ischar # Check for character
- jnz sio_flush.0 # Till none
- ret # To caller
+sio_flush: xorl %eax,%eax # Return value
+ xorl %ecx,%ecx # Timeout
+ movb $0x80,%ch # counter
+sio_flush.1: call sio_ischar # Check for character
+ jz sio_flush.2 # Till none
+ loop sio_flush.1 # or counter is zero
+ movb $1, %al # Exhausted all tries
+sio_flush.2: ret # To caller
/*
* void sio_putc(int c)