From owner-p4-projects@FreeBSD.ORG  Fri Sep 15 17:51:09 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 205D316A563; Fri, 15 Sep 2006 17:51:09 +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 B511A16A40F
	for <perforce@freebsd.org>; Fri, 15 Sep 2006 17:51:08 +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 0322A43D45
	for <perforce@freebsd.org>; Fri, 15 Sep 2006 17:51:07 +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 k8FHp7Gv022686
	for <perforce@freebsd.org>; Fri, 15 Sep 2006 17:51:07 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8FHp7Gv022679
	for perforce@freebsd.org; Fri, 15 Sep 2006 17:51:07 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 15 Sep 2006 17:51:07 GMT
Message-Id: <200609151751.k8FHp7Gv022679@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 106161 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, 15 Sep 2006 17:51:09 -0000

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

Change 106161 by imp@imp_lighthouse on 2006/09/15 17:50:19

	A little more data shuffling gives us another 40 bytes.
	This eliminates the EMAC_Init function entirely, since it is
	now all initialized in the proper place.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#32 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#13 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#6 edit

Differences ...

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

@@ -31,11 +31,13 @@
 
 /* ********************** PRIVATE FUNCTIONS/DATA ******************************/
 
+static receive_descriptor_t *p_rxBD = (receive_descriptor_t*)RX_BUFFER_START;
+static unsigned short localPort = SWAP16(0x8002);
 static unsigned short serverPort;
 static unsigned serverMACSet;
 static unsigned localIPSet, serverIPSet;
 static unsigned	lastSize;
-static char serverMACAddr[6];
+static unsigned char serverMACAddr[6];
 static unsigned char localIPAddr[4], serverIPAddr[4];
 static int	ackBlock;
 static char *dlAddress;

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

@@ -130,7 +130,6 @@
 extern unsigned char localMACAddr[6];
 extern unsigned localMAClow, localMAChigh;
 extern unsigned localMACSet;
-extern receive_descriptor_t *p_rxBD;
-extern unsigned short localPort;
+#define EMAC_Init()
 
 #endif /* _EMAC_H_ */

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

@@ -59,8 +59,6 @@
 unsigned localMACSet;
 unsigned char localMACAddr[6];
 unsigned localMAClow, localMAChigh;
-unsigned short	localPort;
-receive_descriptor_t *p_rxBD;
 
 /* ********************** PRIVATE FUNCTIONS/DATA ******************************/
 
@@ -117,16 +115,3 @@
 	pEmac->EMAC_SA1L = localMAClow;
 	pEmac->EMAC_SA1H = localMAChigh;
 }
-
-/*
- * .KB_C_FN_DEFINITION_START
- * void EMAC_Init(void)
- *  This global function initializes variables used in tftp transfers.
- * .KB_C_FN_DEFINITION_END
- */
-void
-EMAC_Init(void)
-{
-	p_rxBD = (receive_descriptor_t*)RX_BUFFER_START;
-	localPort = SWAP16(0x8002);
-}