From owner-svn-src-user@FreeBSD.ORG  Sat Apr 11 12:04:03 2009
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 AEC67106577B;
	Sat, 11 Apr 2009 12:04: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 85CBC8FC16;
	Sat, 11 Apr 2009 12:04: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 n3BC43nw085565;
	Sat, 11 Apr 2009 12:04:03 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3BC43O7085564;
	Sat, 11 Apr 2009 12:04:03 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <200904111204.n3BC43O7085564@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Sat, 11 Apr 2009 12:04: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: r190916 - user/nyan/pc98/sys/dev/uart
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: Sat, 11 Apr 2009 12:04:26 -0000

Author: nyan
Date: Sat Apr 11 12:04:03 2009
New Revision: 190916
URL: http://svn.freebsd.org/changeset/base/190916

Log:
  MFH: revision 190834
  
    Fix hangs.

Modified:
  user/nyan/pc98/sys/dev/uart/uart_dev_i8251.c

Modified: user/nyan/pc98/sys/dev/uart/uart_dev_i8251.c
==============================================================================
--- user/nyan/pc98/sys/dev/uart/uart_dev_i8251.c	Sat Apr 11 10:37:04 2009	(r190915)
+++ user/nyan/pc98/sys/dev/uart/uart_dev_i8251.c	Sat Apr 11 12:04:03 2009	(r190916)
@@ -351,15 +351,17 @@ i8251_set_icr(struct uart_bas *bas, u_in
 static void
 i8251_clrint(struct uart_bas *bas)
 {
-	u_int8_t iir;
+	u_int8_t iir, lsr;
 
 	if (GET_SUBTYPE(bas) & COM_SUB_I8251F) {
 		iir = uart_getreg(bas, serf_iir);
 		while ((iir & IIR_NOPEND) == 0) {
 			iir &= IIR_IMASK;
-			if (iir == IIR_RLS)
-				(void)uart_getreg(bas, serf_lsr);
-			else if (iir == IIR_RXRDY || iir == IIR_RXTOUT)
+			if (iir == IIR_RLS) {
+				lsr = uart_getreg(bas, serf_lsr);
+				if (lsr & (FLSR_BI | FLSR_PE))
+					(void)uart_getreg(bas, serf_data);
+			} else if (iir == IIR_RXRDY || iir == IIR_RXTOUT)
 				(void)uart_getreg(bas, serf_data);
 			else if (iir == IIR_MLSC)
 				(void)uart_getreg(bas, serf_msr);
@@ -1052,7 +1054,8 @@ i8251_bus_ipend(struct uart_softc *sc)
 		if ((lsr & STS8251_TxRDY) && sc->sc_txbusy)
 			ipend |= SER_INT_TXIDLE;
 	}
-
+	if (ipend == 0)
+		i8251_clrint(bas);
 	uart_unlock(sc->sc_hwmtx);
 
 	return ((sc->sc_leaving) ? 0 : ipend);