From owner-svn-src-projects@freebsd.org Thu Aug 3 05:28:17 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69139DCADE4 for ; Thu, 3 Aug 2017 05:28:17 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 44DED6775A; Thu, 3 Aug 2017 05:28:17 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v735SGEl041160; Thu, 3 Aug 2017 05:28:16 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v735SFwv041154; Thu, 3 Aug 2017 05:28:15 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201708030528.v735SFwv041154@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 3 Aug 2017 05:28:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321970 - in projects/make-check-sandbox/sys/boot: arm/at91/libat91 arm/ixp425/boot2 i386/boot2 X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/make-check-sandbox/sys/boot: arm/at91/libat91 arm/ixp425/boot2 i386/boot2 X-SVN-Commit-Revision: 321970 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2017 05:28:17 -0000 Author: ngie Date: Thu Aug 3 05:28:15 2017 New Revision: 321970 URL: https://svnweb.freebsd.org/changeset/base/321970 Log: MFhead@r321969 Modified: projects/make-check-sandbox/sys/boot/arm/at91/libat91/lib.h projects/make-check-sandbox/sys/boot/arm/at91/libat91/printf.c projects/make-check-sandbox/sys/boot/arm/at91/libat91/putchar.c projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/ixp425_board.c projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/lib.h projects/make-check-sandbox/sys/boot/i386/boot2/boot2.c Directory Properties: projects/make-check-sandbox/ (props changed) Modified: projects/make-check-sandbox/sys/boot/arm/at91/libat91/lib.h ============================================================================== --- projects/make-check-sandbox/sys/boot/arm/at91/libat91/lib.h Thu Aug 3 05:27:05 2017 (r321969) +++ projects/make-check-sandbox/sys/boot/arm/at91/libat91/lib.h Thu Aug 3 05:28:15 2017 (r321970) @@ -28,9 +28,9 @@ #define ARM_BOOT_LIB_H int getc(int); -void putchar(int); -void xputchar(int); -void printf(const char *fmt,...); +int putchar(int); +int xputchar(int); +int printf(const char *fmt,...); /* The following function write eeprom at ee_addr using data */ /* from data_add for size bytes. */ Modified: projects/make-check-sandbox/sys/boot/arm/at91/libat91/printf.c ============================================================================== --- projects/make-check-sandbox/sys/boot/arm/at91/libat91/printf.c Thu Aug 3 05:27:05 2017 (r321969) +++ projects/make-check-sandbox/sys/boot/arm/at91/libat91/printf.c Thu Aug 3 05:28:15 2017 (r321970) @@ -20,12 +20,13 @@ #include #include "lib.h" -void +int printf(const char *fmt,...) { va_list ap; const char *hex = "0123456789abcdef"; char buf[10]; + const char *fmt_orig = fmt; char *s; unsigned u; int c; @@ -66,5 +67,5 @@ printf(const char *fmt,...) } va_end(ap); - return; + return (int)(fmt - fmt_orig); } Modified: projects/make-check-sandbox/sys/boot/arm/at91/libat91/putchar.c ============================================================================== --- projects/make-check-sandbox/sys/boot/arm/at91/libat91/putchar.c Thu Aug 3 05:27:05 2017 (r321969) +++ projects/make-check-sandbox/sys/boot/arm/at91/libat91/putchar.c Thu Aug 3 05:28:15 2017 (r321970) @@ -39,11 +39,11 @@ #include "lib.h" /* - * void putchar(int ch) + * int putchar(int ch) * Writes a character to the DBGU port. It assumes that DBGU has * already been initialized. */ -void +int putchar(int ch) { AT91PS_USART pUSART = (AT91PS_USART)AT91C_BASE_DBGU; @@ -51,12 +51,14 @@ putchar(int ch) while (!(pUSART->US_CSR & AT91C_US_TXRDY)) continue; pUSART->US_THR = (ch & 0xFF); + return (1); } -void +int xputchar(int ch) { - if (ch == '\n') - putchar('\r'); - putchar(ch); + if (ch == '\n') + putchar('\r'); + putchar(ch); + return (ch == '\n' ? 2 : 1); } Modified: projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/ixp425_board.c ============================================================================== --- projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/ixp425_board.c Thu Aug 3 05:27:05 2017 (r321969) +++ projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/ixp425_board.c Thu Aug 3 05:28:15 2017 (r321970) @@ -165,7 +165,7 @@ getc(int seconds) return c; } -void +int putchar(int ch) { int delay, limit; @@ -179,14 +179,16 @@ putchar(int ch) limit = 40; while ((uart_getreg(ubase, REG_LSR) & LSR_TEMT) == 0 && --limit) DELAY(delay); + return (1); } -void +int xputchar(int ch) { if (ch == '\n') putchar('\r'); putchar(ch); + return (ch == '\n' ? 2 : 1); } void Modified: projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/lib.h ============================================================================== --- projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/lib.h Thu Aug 3 05:27:05 2017 (r321969) +++ projects/make-check-sandbox/sys/boot/arm/ixp425/boot2/lib.h Thu Aug 3 05:28:15 2017 (r321970) @@ -35,12 +35,12 @@ int main(void); void DELAY(int); int getc(int); -void putchar(int); -void xputchar(int); +int putchar(int); +int xputchar(int); void putstr(const char *); void puthex8(u_int8_t); void puthexlist(const u_int8_t *, int); -void printf(const char *fmt,...); +int printf(const char *fmt,...); void bzero(void *, size_t); char *strcpy(char *to, const char *from); Modified: projects/make-check-sandbox/sys/boot/i386/boot2/boot2.c ============================================================================== --- projects/make-check-sandbox/sys/boot/i386/boot2/boot2.c Thu Aug 3 05:27:05 2017 (r321969) +++ projects/make-check-sandbox/sys/boot/i386/boot2/boot2.c Thu Aug 3 05:28:15 2017 (r321970) @@ -114,8 +114,8 @@ void exit(int); static void load(void); static int parse(void); static int dskread(void *, unsigned, unsigned); -static void printf(const char *,...); -static void putchar(int); +static int printf(const char *,...); +static int putchar(int); static int drvread(void *, unsigned, unsigned); static int keyhit(unsigned); static int xputc(int); @@ -521,11 +521,12 @@ error: return -1; } -static void +static int printf(const char *fmt,...) { va_list ap; static char buf[10]; + const char *fmt_orig = fmt; char *s; unsigned u; int c; @@ -556,15 +557,16 @@ printf(const char *fmt,...) putchar(c); } va_end(ap); - return; + return (int)(fmt - fmt_orig); } -static void +static int putchar(int c) { if (c == '\n') xputc('\r'); xputc(c); + return (c == '\n' ? 2 : 1); } static int