From 91649ac9bd142356347fce7007015baa8bef96c6 Mon Sep 17 00:00:00 2001
From: Yoshihiro Takahashi <nyan@FreeBSD.org>
Date: Wed, 13 Apr 2005 13:12:12 +0000
Subject: [PATCH] Move pc98 specific parts to the pc98 specific file.

---
 sys/i386/include/clock.h      |  5 -----
 sys/i386/include/pc/display.h |  5 -----
 sys/pc98/include/clock.h      | 36 ++++++++++++++++++++++++++++++++--
 sys/pc98/include/pc/display.h | 37 +++++++++++++++++++++++++++++++++--
 4 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index ddc1d760668d..8a14df3c34ee 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -33,12 +33,7 @@ struct clockframe;
 
 int	acquire_timer2(int mode);
 int	release_timer2(void);
-#ifndef PC98
 int	rtcin(int val);
-#else
-int	acquire_timer1(int mode);
-int	release_timer1(void);
-#endif
 int	sysbeep(int pitch, int period);
 void	timer_restore(void);
 void	init_TSC(void);
diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h
index 36f91deb0979..cd2d5ff35b73 100644
--- a/sys/i386/include/pc/display.h
+++ b/sys/i386/include/pc/display.h
@@ -37,12 +37,7 @@
 
 /* Monochrome attributes for foreground text */
 
-#ifdef PC98
-/* PC-98 attributes for foreground text */
-#define	FG_UNDERLINE		0x08
-#else
 #define	FG_UNDERLINE		0x01
-#endif
 #define	FG_INTENSE		0x08
 
 /* Monochrome attributes for text background */
diff --git a/sys/pc98/include/clock.h b/sys/pc98/include/clock.h
index 9c9ff18a384f..a2a654ad52d5 100644
--- a/sys/pc98/include/clock.h
+++ b/sys/pc98/include/clock.h
@@ -1,6 +1,38 @@
 /*-
- * This file is in the public domain.
+ * Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (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$
  */
-/* $FreeBSD$ */
+
+#ifndef _PC98_INCLUDE_CLOCK_H_
+#define _PC98_INCLUDE_CLOCK_H_
 
 #include <i386/clock.h>
+
+#ifdef _KERNEL
+int acquire_timer1(int);
+int release_timer1(void);
+#endif
+
+#endif /* _PC98_INCLUDE_CLOCK_H_ */
diff --git a/sys/pc98/include/pc/display.h b/sys/pc98/include/pc/display.h
index 76698abe35ba..0a906c885d8c 100644
--- a/sys/pc98/include/pc/display.h
+++ b/sys/pc98/include/pc/display.h
@@ -1,6 +1,39 @@
 /*-
- * This file is in the public domain.
+ * Copyright (C) 2005 TAKAHASHI Yoshihiro. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (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$
  */
-/* $FreeBSD$ */
+
+#ifndef _PC98_INCLUDE_PC_DISPLAY_H_
+#define _PC98_INCLUDE_PC_DISPLAY_H_
 
 #include <i386/pc/display.h>
+
+/*
+ *  PC-98 attributes for foreground text.
+ */
+#undef FG_UNDERLINE
+#define FG_UNDERLINE            0x08
+
+#endif /* !_PC98_INCLUDE_PC_DISPLAY_H_ */