6633412 sys/consplat.h is needed

7 files changed, 64 insertions, 42 deletions

diff --git a/usr/src/pkgdefs/SUNWhea/prototype_com b/usr/src/pkgdefs/SUNWhea/prototype_com
index bf0e84c13b..c31372da78 100644
--- a/usr/src/pkgdefs/SUNWhea/prototype_com
+++ b/usr/src/pkgdefs/SUNWhea/prototype_com
@@ -23,8 +23,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
 # and their location on the development machine when building the package.
@@ -689,6 +687,7 @@ f none usr/include/sys/condvar_impl.h 644 root bin
 f none usr/include/sys/conf.h 644 root bin
 f none usr/include/sys/consdev.h 644 root bin
 f none usr/include/sys/console.h 644 root bin
+f none usr/include/sys/consplat.h 644 root bin
 d none usr/include/sys/contract 755 root bin
 f none usr/include/sys/contract.h 644 root bin
 f none usr/include/sys/contract_impl.h 644 root bin
diff --git a/usr/src/uts/common/io/consconfig_dacf.c b/usr/src/uts/common/io/consconfig_dacf.c
index 933f2c98ae..fbc71cb239 100644
--- a/usr/src/uts/common/io/consconfig_dacf.c
+++ b/usr/src/uts/common/io/consconfig_dacf.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This module performs two functions.  First, it kicks off the driver loading
  * of the console devices during boot in dynamic_console_config().
@@ -127,6 +125,7 @@
 #include <sys/kmem.h>
 #include <sys/dacf.h>
 #include <sys/consconfig_dacf.h>
+#include <sys/consplat.h>
 #include <sys/log.h>
 #include <sys/disp.h>
 
@@ -260,7 +259,7 @@ struct dacfsw dacfsw = {
 
 struct modldacf modldacf = {
 	&mod_dacfops,   /* Type of module */
-	"Consconfig DACF %I%",
+	"Consconfig DACF",
 	&dacfsw
 };
 
diff --git a/usr/src/uts/common/io/openprom.c b/usr/src/uts/common/io/openprom.c
index eb5bb0ab59..f1a08b39b4 100644
--- a/usr/src/uts/common/io/openprom.c
+++ b/usr/src/uts/common/io/openprom.c
@@ -22,8 +22,6 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4 */
-
 /*
  * Ported from 4.1.1_PSRA: "@(#)openprom.c 1.19 91/02/19 SMI";
  *
@@ -56,6 +54,7 @@
 #include <sys/nvpair.h>
 #include <sys/wanboot_impl.h>
 #include <sys/zone.h>
+#include <sys/consplat.h>
 
 #define	MAX_OPENS	32	/* Up to this many simultaneous opens */
 
@@ -64,9 +63,6 @@
 #define	IOC_DONE	2	/* snapshot done, but not copied out */
 #define	IOC_COPY	3	/* copyout in progress */
 
-extern int plat_stdout_is_framebuffer(void);
-extern int plat_stdin_is_keyboard(void);
-
 /*
  * XXX	Make this dynamic.. or (better still) make the interface stateless
  */
@@ -134,7 +130,7 @@ static struct dev_ops openeepr_ops = {
  */
 static struct modldrv modldrv = {
 	&mod_driverops,
-	"OPENPROM/NVRAM Driver v%I%",
+	"OPENPROM/NVRAM Driver",
 	&openeepr_ops
 };
 
diff --git a/usr/src/uts/common/io/tem.c b/usr/src/uts/common/io/tem.c
index 775cd5c649..3cc0df18c3 100644
--- a/usr/src/uts/common/io/tem.c
+++ b/usr/src/uts/common/io/tem.c
@@ -20,12 +20,10 @@
  */
 
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * ANSI terminal emulator module; parse ANSI X3.64 escape sequences and
  * the like.
@@ -60,7 +58,7 @@
 #ifdef _HAVE_TEM_FIRMWARE
 #include <sys/promif.h>
 #endif /* _HAVE_TEM_FIRMWARE */
-#include <sys/consconfig_dacf.h>
+#include <sys/consplat.h>
 
 /* Terminal emulator functions */
 static int	tem_setup_terminal(struct vis_devinit *, tem_t *,
diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile
index 0095caf0a2..0b827c3bde 100644
--- a/usr/src/uts/common/sys/Makefile
+++ b/usr/src/uts/common/sys/Makefile
@@ -125,6 +125,7 @@ CHKHDRS=			\
 	conf.h			\
 	consdev.h		\
 	console.h		\
+        consplat.h              \
 	contract.h		\
 	contract_impl.h		\
 	copyops.h		\
diff --git a/usr/src/uts/common/sys/consconfig_dacf.h b/usr/src/uts/common/sys/consconfig_dacf.h
index 446cd10cdf..bc93197bb3 100644
--- a/usr/src/uts/common/sys/consconfig_dacf.h
+++ b/usr/src/uts/common/sys/consconfig_dacf.h
@@ -27,8 +27,6 @@
 #ifndef	_SYS_CONSCONFIG_DACF_H
 #define	_SYS_CONSCONFIG_DACF_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -36,7 +34,6 @@ extern "C" {
 #define	CONS_MS		1
 #define	CONS_KBD	2
 
-
 /*
  * This structure contains information about keyboard
  * and mouse used for auto-configuration.
@@ -115,32 +112,8 @@ typedef struct cons_state {
 
 #define	DPRINTF consconfig_dprintf
 
-/*
- * Implementation functions from consplat
- */
-extern int	plat_use_polled_debug(void);
-extern char	*plat_stdinpath(void);
-extern char	*plat_stdoutpath(void);
-extern char	*plat_fbpath(void);
-extern char	*plat_kbdpath(void);
-extern char	*plat_mousepath(void);
-extern int	plat_stdout_is_framebuffer(void);
-extern int	plat_stdin_is_keyboard(void);
-extern int	plat_virtual_console_path(char **);
-
-extern void	plat_tem_get_inverses(int *, int *);
-extern void	plat_tem_get_prom_font_size(int *, int *);
-extern void	plat_tem_get_prom_size(size_t *, size_t *);
-extern void	plat_tem_hide_prom_cursor(void);
-extern void	plat_tem_get_prom_pos(uint32_t *, uint32_t *);
-
-
-/*
- * Other external functions
- */
 extern void	kadb_uses_kernel(void);
 
-
 #ifdef	__cplusplus
 }
 #endif
diff --git a/usr/src/uts/common/sys/consplat.h b/usr/src/uts/common/sys/consplat.h
new file mode 100644
index 0000000000..b9fea3f5ce
--- /dev/null
+++ b/usr/src/uts/common/sys/consplat.h
@@ -0,0 +1,56 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	_SYS_CONSPLAT_H
+#define	_SYS_CONSPLAT_H
+
+#include <sys/types.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+extern int plat_use_polled_debug(void);
+extern int plat_support_serial_kbd_and_ms(void);
+extern char *plat_kbdpath(void);
+extern char *plat_fbpath(void);
+extern char *plat_mousepath(void);
+extern char *plat_stdinpath(void);
+extern char *plat_stdoutpath(void);
+extern int plat_stdin_is_keyboard(void);
+extern int plat_stdout_is_framebuffer(void);
+extern void plat_tem_get_inverses(int *, int *);
+extern void plat_tem_get_prom_font_size(int *, int *);
+extern void plat_tem_get_prom_size(size_t *, size_t *);
+extern void plat_tem_hide_prom_cursor(void);
+extern void plat_tem_get_prom_pos(uint32_t *, uint32_t *);
+extern int plat_virtual_console_path(char **);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _SYS_CONSPLAT_H */