From owner-p4-projects@FreeBSD.ORG  Thu Aug 10 23:17:48 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 C43AD16A4DF; Thu, 10 Aug 2006 23:17:48 +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 9F83416A4DE
	for <perforce@freebsd.org>; Thu, 10 Aug 2006 23:17:48 +0000 (UTC)
	(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 4E7D643D4C
	for <perforce@freebsd.org>; Thu, 10 Aug 2006 23:17:48 +0000 (GMT)
	(envelope-from imp@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 k7ANHmBZ079172
	for <perforce@freebsd.org>; Thu, 10 Aug 2006 23:17:48 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ANHmNm079169
	for perforce@freebsd.org; Thu, 10 Aug 2006 23:17:48 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 10 Aug 2006 23:17:48 GMT
Message-Id: <200608102317.k7ANHmNm079169@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 103617 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, 10 Aug 2006 23:17:49 -0000

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

Change 103617 by imp@imp_lighthouse on 2006/08/10 23:17:05

	rename SetMACAddress to EMAC_SetMACAddress

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#13 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#6 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#17 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#23 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#7 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#13 (text+ko) ====

@@ -266,7 +266,7 @@
 		if (argc > 6) {
 			for (i = 0; i < 6; i++)
 				mac[i] = p_ASCIIToHex(argv[i + 1]);
-			SetMACAddress(mac);
+			EMAC_SetMACAddress(mac);
 		}
 		break;
 	}

==== //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#6 (text+ko) ====

@@ -97,7 +97,7 @@
 #endif
 	EMAC_Init();
 	sdcard_init();
-	SetMACAddress(mac);
+	EMAC_SetMACAddress(mac);
 	printf("Reading from card...");
 #ifdef REAL
 	for (i = 0x80; i < 10 * 2048; i++) {

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#17 (text+ko) ====

@@ -283,7 +283,7 @@
 		if (argc > 6) {
 			for (i = 0; i < 6; i++)
 				mac[i] = p_ASCIIToHex(argv[i + 1]);
-			SetMACAddress(mac);
+			EMAC_SetMACAddress(mac);
 		}
 		break;
 	}

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#23 (text+ko) ====

@@ -475,13 +475,13 @@
 
 /*
  * .KB_C_FN_DEFINITION_START
- * void SetMACAddress(unsigned low_address, unsigned high_address)
+ * void EMAC_SetMACAddress(unsigned low_address, unsigned high_address)
  *  This global function sets the MAC address.  low_address is the first
  * four bytes while high_address is the last 2 bytes of the 48-bit value.
  * .KB_C_FN_DEFINITION_END
  */
 void
-SetMACAddress(unsigned char mac[6])
+EMAC_SetMACAddress(unsigned char mac[6])
 {
 	AT91PS_PMC	pPMC = AT91C_BASE_PMC;
 	AT91PS_EMAC	pEmac = AT91C_BASE_EMAC;

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#7 (text+ko) ====

@@ -24,7 +24,7 @@
 #ifndef _EMAC_H_
 #define _EMAC_H_
 
-extern void SetMACAddress(unsigned char addr[6]);
+extern void EMAC_SetMACAddress(unsigned char addr[6]);
 extern void SetServerIPAddress(unsigned address);
 extern void SetLocalIPAddress(unsigned address);
 extern void EMAC_Init(void);