Date: Fri, 15 Sep 2006 17:51:07 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 106161 for review Message-ID: <200609151751.k8FHp7Gv022679@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); -}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609151751.k8FHp7Gv022679>