svn commit: r220685 - head/sys/boot/pc98/boot2
Takahashi Yoshihiro
nyan at FreeBSD.org
Sat Apr 16 06:20:49 UTC 2011
Author: nyan
Date: Sat Apr 16 06:20:49 2011
New Revision: 220685
URL: http://svn.freebsd.org/changeset/base/220685
Log:
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:
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/pc98/boot2/boot2.c
==============================================================================
--- head/sys/boot/pc98/boot2/boot2.c Sat Apr 16 00:10:55 2011 (r220684)
+++ head/sys/boot/pc98/boot2/boot2.c Sat Apr 16 06:20:49 2011 (r220685)
@@ -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;
-}
More information about the svn-src-head
mailing list