From owner-p4-projects@FreeBSD.ORG  Thu Mar 29 18:27:07 2007
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 0C58A16A406; Thu, 29 Mar 2007 18:27:07 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C0BDE16A401
	for <perforce@freebsd.org>; Thu, 29 Mar 2007 18:27:06 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id AFAAC13C4B0
	for <perforce@freebsd.org>; Thu, 29 Mar 2007 18:27:06 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2TIR60U000852
	for <perforce@freebsd.org>; Thu, 29 Mar 2007 18:27:06 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2TIR6FD000849
	for perforce@freebsd.org; Thu, 29 Mar 2007 18:27:06 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 29 Mar 2007 18:27:06 GMT
Message-Id: <200703291827.l2TIR6FD000849@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 116855 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, 29 Mar 2007 18:27:07 -0000

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

Change 116855 by marcel@marcel_jnpr on 2007/03/29 18:26:39

	o  White-space fixes.
	o  Make the bug work-around specific to PowerPC, as it
	   applies to the Apple chipset.

Affected files ...

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

Differences ...

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

@@ -162,15 +162,16 @@
 	if (bas->rclk == 0)
 		bas->rclk = DEFAULT_RCLK;
 
+#ifdef __powerpc__
 	switch (bas->chan) {
 	case 1:
 		uart_setmreg(bas, WR_MIC, MIC_NV | MIC_CRA);
-                break;
-        case 2:
-                uart_setmreg(bas, WR_MIC, MIC_NV | MIC_CRB);
-                break;
-        }
-        uart_barrier(bas);
+		break;
+	case 2:
+		uart_setmreg(bas, WR_MIC, MIC_NV | MIC_CRB);
+		break;
+	}
+	uart_barrier(bas);
 	uart_setmreg(bas, WR_MPM, MPM_CM1 | MPM_MONO | MPM_SYNC);
 	uart_setmreg(bas, WR_RPC, RPC_RB8);
 	uart_setmreg(bas, WR_TPC, TPC_TB8 | TPC_RTS);
@@ -188,6 +189,7 @@
 	uart_getreg(bas, REG_DATA);
 	uart_setreg(bas, REG_CTRL, CR_RSTXSI);
 	uart_setreg(bas, REG_CTRL, CR_RSTERR);
+#endif
 
 	/* Assume we don't need to perform a full hardware reset. */
 	switch (bas->chan) {