Date: Tue, 26 Jul 2011 13:13:31 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r224428 - stable/8/sys/boot/pc98/boot2 Message-ID: <201107261313.p6QDDVIk009641@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Tue Jul 26 13:13:31 2011 New Revision: 224428 URL: http://svn.freebsd.org/changeset/base/224428 Log: MFC: r220685 MFi386: revisions 220389 and 220392 - Mark getc() as inline, this has no effect on gcc but helps clang. - Move getc() body before xgetc() so gcc does not emit a warning about function having no body. Modified: stable/8/sys/boot/pc98/boot2/boot2.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/geom/label/ (props changed) Modified: stable/8/sys/boot/pc98/boot2/boot2.c ============================================================================== --- stable/8/sys/boot/pc98/boot2/boot2.c Tue Jul 26 13:12:09 2011 (r224427) +++ stable/8/sys/boot/pc98/boot2/boot2.c Tue Jul 26 13:13:31 2011 (r224428) @@ -150,7 +150,7 @@ static int drvread(void *, unsigned); static int keyhit(unsigned); static int xputc(int); static int xgetc(int); -static int getc(int); +static inline int getc(int); static void memcpy(void *, const void *, int); static void @@ -779,6 +779,18 @@ xputc(int c) } static int +getc(int fn) +{ + v86.addr = 0x18; + v86.eax = fn << 8; + v86int(); + if (fn) + return (v86.ebx >> 8) & 0x01; + else + return v86.eax & 0xff; +} + +static int xgetc(int fn) { if (OPT_CHECK(RBX_NOINTR)) @@ -792,15 +804,3 @@ xgetc(int fn) return 0; } } - -static int -getc(int fn) -{ - v86.addr = 0x18; - v86.eax = fn << 8; - v86int(); - if (fn) - return (v86.ebx >> 8) & 0x01; - else - return v86.eax & 0xff; -}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107261313.p6QDDVIk009641>