From owner-p4-projects@FreeBSD.ORG  Thu Dec 15 03:17:50 2005
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 98B1216A420; Thu, 15 Dec 2005 03:17:49 +0000 (GMT)
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 5B52516A41F
	for <perforce@freebsd.org>; Thu, 15 Dec 2005 03:17:49 +0000 (GMT)
	(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 A61BB43D62
	for <perforce@freebsd.org>; Thu, 15 Dec 2005 03:17:48 +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 jBF3Hmd5023755
	for <perforce@freebsd.org>; Thu, 15 Dec 2005 03:17:48 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBF3Hm59023752
	for perforce@freebsd.org; Thu, 15 Dec 2005 03:17:48 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 15 Dec 2005 03:17:48 GMT
Message-Id: <200512150317.jBF3Hm59023752@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 88220 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: Thu, 15 Dec 2005 03:17:50 -0000

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

Change 88220 by marcel@marcel_nfs on 2005/12/15 03:17:33

	s/UART_IPEND/SER_INT/g

Affected files ...

.. //depot/projects/uart/dev/uart/uart_dev_z8530.c#24 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#24 (text+ko) ====

@@ -305,7 +305,7 @@
 		z8530->tpc = z8530_setup(bas, 9600, 8, 1, UART_PARITY_NONE);
 		z8530->tpc &= ~(TPC_DTR|TPC_RTS);
 	}
-	z8530->txidle = 1;	/* Report UART_IPEND_TXIDLE. */
+	z8530->txidle = 1;	/* Report SER_INT_TXIDLE. */
 
 	sc->sc_rxfifosz = 3;
 	sc->sc_txfifosz = 1;
@@ -418,14 +418,14 @@
 	}
 
 	if (ip & IP_RIA)
-		ipend |= UART_IPEND_RXREADY;
+		ipend |= SER_INT_RXREADY;
 
 	if (ip & IP_TIA) {
 		uart_setreg(bas, REG_CTRL, CR_RSTTXI);
 		uart_barrier(bas);
 		if (z8530->txidle) {
-			ipend |= UART_IPEND_TXIDLE;
-			z8530->txidle = 0;	/* Mask UART_IPEND_TXIDLE. */
+			ipend |= SER_INT_TXIDLE;
+			z8530->txidle = 0;	/* Mask SER_INT_TXIDLE. */
 		}
 	}
 
@@ -434,18 +434,18 @@
 		uart_barrier(bas);
 		bes = uart_getmreg(bas, RR_BES);
 		if (bes & BES_BRK)
-			ipend |= UART_IPEND_BREAK;
+			ipend |= SER_INT_BREAK;
 		sig = sc->sc_hwsig;
 		SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS);
 		SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD);
 		SIGCHG(bes & BES_SYNC, sig, SER_DSR, SER_DDSR);
 		if (sig & UART_SIGMASK_DELTA)
-			ipend |= UART_IPEND_SIGCHG;
+			ipend |= SER_INT_SIGCHG;
 		src = uart_getmreg(bas, RR_SRC);
 		if (src & SRC_OVR) {
 			uart_setreg(bas, REG_CTRL, CR_RSTERR);
 			uart_barrier(bas);
-			ipend |= UART_IPEND_OVERRUN;
+			ipend |= SER_INT_OVERRUN;
 		}
 	}
 
@@ -586,7 +586,7 @@
 	uart_setreg(bas, REG_DATA, sc->sc_txbuf[0]);
 	uart_barrier(bas);
 	sc->sc_txbusy = 1;
-	z8530->txidle = 1;	/* Report UART_IPEND_TXIDLE again. */
+	z8530->txidle = 1;	/* Report SER_INT_TXIDLE again. */
 	mtx_unlock_spin(&sc->sc_hwmtx);
 	return (0);
 }