From owner-p4-projects@FreeBSD.ORG  Tue Mar 28 22:00:52 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4960316A588; Tue, 28 Mar 2006 22:00:52 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2124416A578
	for <perforce@freebsd.org>; Tue, 28 Mar 2006 22:00:52 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D703B43D45
	for <perforce@freebsd.org>; Tue, 28 Mar 2006 22:00:51 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2SM0pKv069688
	for <perforce@freebsd.org>; Tue, 28 Mar 2006 22:00:51 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2SM0p10069685
	for perforce@freebsd.org; Tue, 28 Mar 2006 22:00:51 GMT
	(envelope-from marcel@freebsd.org)
Date: Tue, 28 Mar 2006 22:00:51 GMT
Message-Id: <200603282200.k2SM0p10069685@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94213 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Mar 2006 22:00:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=94213

Change 94213 by marcel@marcel_nfs on 2006/03/28 22:00:49

	Perform a reset external/status interrupt before reading RR0.
	Any status that triggers XSI will be latched and we may not
	read the current status for them.

Affected files ...

.. //depot/projects/uart/dev/scc/scc_dev_z8530.c#6 edit

Differences ...

==== //depot/projects/uart/dev/scc/scc_dev_z8530.c#6 (text+ko) ====

@@ -114,7 +114,7 @@
 		scc_getreg(bas, c + REG_DATA);
 		scc_barrier(bas);
 	}
-	if (ch->ch_ipend & SER_INT_SIGCHG) {
+	if (ch->ch_ipend & (SER_INT_SIGCHG|SER_INT_BREAK)) {
 		scc_setreg(bas, c + REG_CTRL, CR_RSTXSI);
 		scc_barrier(bas);
 	}
@@ -156,7 +156,9 @@
 	if (ip & IP_TIB)
 		ch[1]->ch_ipend |= SER_INT_TXIDLE;
 	if (ip & IP_SIA) {
-		bes = scc_getreg(bas, CHAN_A + RR_BES);
+		scc_setreg(bas, CHAN_A + REG_CTRL, CR_RSTXSI);
+		scc_barrier(bas);
+		bes = scc_getreg(bas, CHAN_A + REG_CTRL);
 		if (bes & BES_BRK)
 			ch[0]->ch_ipend |= SER_INT_BREAK;
 		sig = ch[0]->ch_hwsig;
@@ -172,7 +174,9 @@
 			ch[0]->ch_ipend |= SER_INT_OVERRUN;
 	}
 	if (ip & IP_SIB) {
-		bes = scc_getreg(bas, CHAN_B + RR_BES);
+		scc_setreg(bas, CHAN_B + REG_CTRL, CR_RSTXSI);
+		scc_barrier(bas);
+		bes = scc_getreg(bas, CHAN_B + REG_CTRL);
 		if (bes & BES_BRK)
 			ch[1]->ch_ipend |= SER_INT_BREAK;
 		sig = ch[1]->ch_hwsig;