From owner-p4-projects@FreeBSD.ORG  Fri Jan  6 20:44:34 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 9561B16A423; Fri,  6 Jan 2006 20:44:33 +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 42A2E16A41F
	for <perforce@freebsd.org>; Fri,  6 Jan 2006 20:44:33 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4E16143D67
	for <perforce@freebsd.org>; Fri,  6 Jan 2006 20:44:28 +0000 (GMT)
	(envelope-from imp@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 k06KiRkM042550
	for <perforce@freebsd.org>; Fri, 6 Jan 2006 20:44:27 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06KiR6f042547
	for perforce@freebsd.org; Fri, 6 Jan 2006 20:44:27 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 6 Jan 2006 20:44:27 GMT
Message-Id: <200601062044.k06KiR6f042547@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89295 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: Fri, 06 Jan 2006 20:44:34 -0000

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

Change 89295 by imp@imp_Speedy on 2006/01/06 20:43:55

	Minor tidy.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#11 edit
.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#14 edit
.. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#11 (text+ko) ====

@@ -161,7 +161,7 @@
 static int
 at91rm92_probe(device_t dev)
 {
-	device_set_desc(dev, "AT91 CPU");
+	device_set_desc(dev, "AT91RM9200 device bus");
 	return (0);
 }
 

==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#14 (text+ko) ====

@@ -594,7 +594,7 @@
 	WR4(sc, ETH_MAN, ETH_MAN_REG_RD(phy, reg));
 	while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0)
 		continue;
-	val = RD4(sc, ETH_MAN) & ETH_MAN_VALUE;
+	val = RD4(sc, ETH_MAN) & ETH_MAN_VALUE_MASK;
 
 	return (val);
 }

==== //depot/projects/arm/src/sys/arm/at91/if_atereg.h#4 (text+ko) ====

@@ -147,10 +147,10 @@
 #define ETH_MAN_WRITE	(1U << 28)
 #define ETH_MAN_PHYA_BIT 23
 #define ETH_MAN_REGA_BIT 18
-#define ETH_MAN_VALUE	0xffffU
+#define ETH_MAN_VALUE_MASK	0xffffU
 #define ETH_MAN_REG_WR(phy, reg, val) \
 		(ETH_MAN_BITS | ETH_MAN_WRITE | ((phy) << ETH_MAN_PHYA_BIT) | \
-		((reg) << ETH_MAN_REGA_BIT) | ((val) & ETH_MAN_VALUE))
+		((reg) << ETH_MAN_REGA_BIT) | ((val) & ETH_MAN_VALUE_MASK))
 #define ETH_MAN_REG_RD(phy, reg) \
 		(ETH_MAN_BITS | ETH_MAN_READ | ((phy) << ETH_MAN_PHYA_BIT) | \
 		((reg) << ETH_MAN_REGA_BIT))