From owner-p4-projects@FreeBSD.ORG  Mon Nov  6 19:50:32 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 D3BCE16A527; Mon,  6 Nov 2006 19:50:31 +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 9045E16A522
	for <perforce@freebsd.org>; Mon,  6 Nov 2006 19:50:31 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 779D143D66
	for <perforce@freebsd.org>; Mon,  6 Nov 2006 19:50:30 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6JoUgG088386
	for <perforce@freebsd.org>; Mon, 6 Nov 2006 19:50:30 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6JoUHO088383
	for perforce@freebsd.org; Mon, 6 Nov 2006 19:50:30 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 6 Nov 2006 19:50:30 GMT
Message-Id: <200611061950.kA6JoUHO088383@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109371 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: Mon, 06 Nov 2006 19:50:32 -0000

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

Change 109371 by sam@sam_ebb on 2006/11/06 19:49:43

	replace magic constants with symbolic names

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#4 edit
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#5 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#4 (text+ko) ====

@@ -134,6 +134,10 @@
 
 #define	IXP425_UART_FREQ	14745600
 
+#define	IXP425_UART_IER		0x01	/* interrupt enable register */
+#define	IXP425_UART_IER_RTOIE	0x10	/* receiver timeout interrupt enable */
+#define	IXP425_UART_IER_UUE	0x40	/* UART Unit enable */
+
 /*#define	IXP4XX_COM_NPORTS	8*/
 
 /*

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#5 (text+ko) ====

@@ -81,8 +81,9 @@
 	 * uart_ns8250 carefully avoids touching these bits so we can
 	 * just set them here and proceed.  But this is fragile...
 	 */
-	bus_space_write_4(&ixp425_a4x_bs_tag, device_get_unit(dev) == 0 ?
-	    IXP425_UART0_VBASE : IXP425_UART1_VBASE, REG_IER, 0x50);
+	bus_space_write_4(&ixp425_a4x_bs_tag,
+	    device_get_unit(dev) == 0 ? IXP425_UART0_VBASE : IXP425_UART1_VBASE,
+	    IXP425_UART_IER, IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE);
 	return(uart_bus_probe(dev, 0, IXP425_UART_FREQ, 0, 0));
 }