Date: Fri, 6 Apr 2018 19:59:28 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332149 - in stable/11/stand/mips/beri: boot2 common loader Message-ID: <201804061959.w36JxSsn043238@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Apr 6 19:59:27 2018 New Revision: 332149 URL: https://svnweb.freebsd.org/changeset/base/332149 Log: MFC r330788: beri loader: Replace getc/putc with beri_ prefixed versions This matches a convention that we use, at least in ubldr, to prefix getc/putc with a loader-specific prefix to avoid collisions. This was encountered while trying to build the beri loader with MK_LOADER_LUA=yes. Modified: stable/11/stand/mips/beri/boot2/boot2.c stable/11/stand/mips/beri/common/altera_jtag_uart.c stable/11/stand/mips/beri/common/cons.h stable/11/stand/mips/beri/loader/beri_console.c Directory Properties: stable/11/ (props changed) Modified: stable/11/stand/mips/beri/boot2/boot2.c ============================================================================== --- stable/11/stand/mips/beri/boot2/boot2.c Fri Apr 6 19:54:10 2018 (r332148) +++ stable/11/stand/mips/beri/boot2/boot2.c Fri Apr 6 19:59:27 2018 (r332149) @@ -627,7 +627,7 @@ static int xputc(int c) { if (ioctrl & IO_KEYBOARD) - putc(c); + beri_putc(c); #if 0 if (ioctrl & IO_SERIAL) sio_putc(c); @@ -642,7 +642,7 @@ xgetc(int fn) return 0; for (;;) { if (ioctrl & IO_KEYBOARD && keyhit(0)) - return fn ? 1 : getc(); + return fn ? 1 : beri_getc(); #if 0 if (ioctrl & IO_SERIAL && sio_ischar()) return fn ? 1 : sio_getc(); Modified: stable/11/stand/mips/beri/common/altera_jtag_uart.c ============================================================================== --- stable/11/stand/mips/beri/common/altera_jtag_uart.c Fri Apr 6 19:54:10 2018 (r332148) +++ stable/11/stand/mips/beri/common/altera_jtag_uart.c Fri Apr 6 19:59:27 2018 (r332149) @@ -159,7 +159,7 @@ keyhit(int seconds) } int -getc(void) +beri_getc(void) { while (!(uart_readable())); @@ -168,7 +168,7 @@ getc(void) } void -putc(int ch) +beri_putc(int ch) { uart_data_write(ch); Modified: stable/11/stand/mips/beri/common/cons.h ============================================================================== --- stable/11/stand/mips/beri/common/cons.h Fri Apr 6 19:54:10 2018 (r332148) +++ stable/11/stand/mips/beri/common/cons.h Fri Apr 6 19:59:27 2018 (r332149) @@ -33,8 +33,8 @@ #ifndef _CONS_H_ #define _CONS_H_ -int getc(void); +int beri_getc(void); int keyhit(int); -void putc(int); +void beri_putc(int); #endif Modified: stable/11/stand/mips/beri/loader/beri_console.c ============================================================================== --- stable/11/stand/mips/beri/loader/beri_console.c Fri Apr 6 19:54:10 2018 (r332148) +++ stable/11/stand/mips/beri/loader/beri_console.c Fri Apr 6 19:59:27 2018 (r332149) @@ -72,14 +72,14 @@ static void c_out(int c) { - putc(c); + beri_putc(c); } static int c_in(void) { - return (getc()); + return (beri_getc()); } static int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804061959.w36JxSsn043238>