From owner-p4-projects@FreeBSD.ORG Fri Sep 15 17:45:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C237616A416; Fri, 15 Sep 2006 17:45:01 +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 84FA516A412 for ; Fri, 15 Sep 2006 17:45:01 +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 996F743D72 for ; Fri, 15 Sep 2006 17:44:54 +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 k8FHisFe022350 for ; Fri, 15 Sep 2006 17:44:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8FHisOf022347 for perforce@freebsd.org; Fri, 15 Sep 2006 17:44:54 GMT (envelope-from imp@freebsd.org) Date: Fri, 15 Sep 2006 17:44:54 GMT Message-Id: <200609151744.k8FHisOf022347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Sep 2006 17:45:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=106159 Change 106159 by imp@imp_lighthouse on 2006/09/15 17:43:53 Move some globals around, remove needless initialization. This saves another 64 bytes from boot2. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#31 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#12 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#31 (text+ko) ==== @@ -31,6 +31,10 @@ /* ********************** PRIVATE FUNCTIONS/DATA ******************************/ +static unsigned short serverPort; +static unsigned serverMACSet; +static unsigned localIPSet, serverIPSet; +static unsigned lastSize; static char serverMACAddr[6]; static unsigned char localIPAddr[4], serverIPAddr[4]; static int ackBlock; ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#12 (text+ko) ==== @@ -129,10 +129,8 @@ extern unsigned char localMACAddr[6]; extern unsigned localMAClow, localMAChigh; -extern unsigned localMACSet, serverMACSet; +extern unsigned localMACSet; extern receive_descriptor_t *p_rxBD; -extern unsigned lastSize; -extern unsigned localIPSet, serverIPSet; -extern unsigned short serverPort, localPort; +extern unsigned short localPort; #endif /* _EMAC_H_ */ ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#5 (text+ko) ==== @@ -56,12 +56,10 @@ /* ****************************** GLOBALS *************************************/ -unsigned lastSize; -unsigned localMACSet, serverMACSet; +unsigned localMACSet; unsigned char localMACAddr[6]; unsigned localMAClow, localMAChigh; -unsigned localIPSet, serverIPSet; -unsigned short serverPort, localPort; +unsigned short localPort; receive_descriptor_t *p_rxBD; /* ********************** PRIVATE FUNCTIONS/DATA ******************************/ @@ -130,10 +128,5 @@ EMAC_Init(void) { p_rxBD = (receive_descriptor_t*)RX_BUFFER_START; - localMACSet = 0; - serverMACSet = 0; - localIPSet = 0; - serverIPSet = 0; localPort = SWAP16(0x8002); - lastSize = 0; }