Date: Fri, 21 Apr 2006 14:07:23 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 95802 for review Message-ID: <200604211407.k3LE7NWP040119@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=95802 Change 95802 by imp@imp_harmony on 2006/04/21 14:06:25 diff reduction to -current # Why I didn't get all of these with the last integration is # a mystery to me. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/env_vars.c#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/env_vars.h#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/getc.c#5 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/loader_prompt.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.2 2006/04/13 17:44:05 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.2 2006/04/21 13:51:47 imp Exp $ .include "${.CURDIR}/../Makefile.inc" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/******************************************************************************* +/****************************************************************************** * * Filename: emac.c * @@ -18,7 +18,9 @@ * owners. This software is not copyrighted and is intended for reference * only. * END_BLOCK - ******************************************************************************/ + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.1 2006/04/19 17:16:49 imp Exp $ + *****************************************************************************/ #include "at91rm9200.h" #include "emac.h" @@ -26,9 +28,9 @@ #include "at91rm9200_lowlevel.h" #include "lib.h" -/* ****************************** GLOBALS *************************************/ +/******************************* GLOBALS *************************************/ -/* ********************** PRIVATE FUNCTIONS/DATA ******************************/ +/*********************** PRIVATE FUNCTIONS/DATA ******************************/ static unsigned localMACSet, serverMACSet, MAC_init; static unsigned char localMACAddr[6], serverMACAddr[6]; ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/******************************************************************************* +/****************************************************************************** * * Filename: emac.h * @@ -16,7 +16,9 @@ * owners. This software is not copyrighted and is intended for reference * only. * END_BLOCK - ******************************************************************************/ + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.1 2006/04/19 17:16:49 imp Exp $ + *****************************************************************************/ #ifndef _EMAC_H_ ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/env_vars.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/******************************************************************************* +/****************************************************************************** * * Filename: env_vars.c * @@ -16,7 +16,9 @@ * owners. This software is not copyrighted and is intended for reference * only. * END_BLOCK - ******************************************************************************/ + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/env_vars.c,v 1.1 2006/04/19 17:16:49 imp Exp $ + *****************************************************************************/ #include "env_vars.h" #include "loader_prompt.h" @@ -24,14 +26,14 @@ #include "eeprom.h" #include "lib.h" -/* ****************************** GLOBALS *************************************/ +/******************************* GLOBALS *************************************/ char boot_commands[MAX_BOOT_COMMANDS][MAX_INPUT_SIZE]; char env_table[MAX_ENV_SIZE_BYTES]; extern char BootCommandSection; -/* ************************* PRIVATE FUNCTIONS ********************************/ +/************************** PRIVATE FUNCTIONS ********************************/ static int currentIndex; @@ -58,7 +60,6 @@ if (ch == '\0' || (currentOffset >= MAX_INPUT_SIZE)) { currentOffset = 0; ++currentIndex; - ch = '\r'; } return (ch); } @@ -67,7 +68,7 @@ } -/* ************************** GLOBAL FUNCTIONS ********************************/ +/*************************** GLOBAL FUNCTIONS ********************************/ /* ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/env_vars.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/******************************************************************************* +/****************************************************************************** * * Filename: env_vars.h * @@ -16,7 +16,9 @@ * owners. This software is not copyrighted and is intended for reference * only. * END_BLOCK - ******************************************************************************/ + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/env_vars.h,v 1.1 2006/04/19 17:16:49 imp Exp $ + *****************************************************************************/ #ifndef _ENV_VARS_H_ #define _ENV_VARS_H_ ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/getc.c#5 (text) ==== @@ -31,7 +31,7 @@ * owners. This software is not copyrighted and is intended for reference * only. * - * $FreeBSD: src/sys/boot/arm/at91/boot0/lib.c,v 1.1 2006/04/12 21:22:44 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/getc.c,v 1.2 2006/04/21 13:58:51 imp Exp $ */ #include "at91rm9200.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#7 (text) ==== @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/arm/at91/boot0/lib.h,v 1.1 2006/04/12 21:22:44 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/lib.h,v 1.1 2006/04/19 17:16:49 imp Exp $ */ #ifndef ARM_BOOT_LIB_H ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/loader_prompt.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/******************************************************************************* +/****************************************************************************** * * Filename: loader_prompt.c * @@ -18,7 +18,9 @@ * owners. This software is not copyrighted and is intended for reference * only. * END_BLOCK - ******************************************************************************/ + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/loader_prompt.c,v 1.2 2006/04/21 13:56:26 imp Exp $ + *****************************************************************************/ #include "at91rm9200_lowlevel.h" #include "p_string.h" @@ -32,10 +34,10 @@ #include "lib.h" -/* ****************************** GLOBALS *************************************/ +/******************************* GLOBALS *************************************/ -/* ********************** PRIVATE FUNCTIONS/DATA ******************************/ +/*********************** PRIVATE FUNCTIONS/DATA ******************************/ static char inputBuffer[MAX_INPUT_SIZE]; static int buffCount;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604211407.k3LE7NWP040119>