X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..c910b4d9d2451126ae3917b931cd4390c11e1d52:/osfmk/ppc/serial_io.h

diff --git a/osfmk/ppc/serial_io.h b/osfmk/ppc/serial_io.h
index 698870bd3..a280fa1a4 100644
--- a/osfmk/ppc/serial_io.h
+++ b/osfmk/ppc/serial_io.h
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code 
- * as defined in and that are subject to the Apple Public Source License 
- * Version 2.0 (the 'License'). You may not use this file except in 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
- *
- * The Original Code and all software distributed under the License are 
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -34,7 +32,10 @@
  * @APPLE_FREE_COPYRIGHT@
  */
 
+#ifndef _PPC_SERIAL_IO_H_
+#define _PPC_SERIAL_IO_H_
 
+#include <console/serial_protos.h>
 #include <device/device_types.h>
 #include <mach_kdp.h>
 
@@ -109,7 +110,7 @@ extern boolean_t	scc_portdeath(
 
 #endif /* 0 */
 
-extern int	 	scc_putc(
+extern void	 	scc_putc(
 				int			unit,
 				int			line,
 				int			c);
@@ -120,23 +121,6 @@ extern int		scc_getc(
 				boolean_t		wait,
 				boolean_t		raw);
 
-/* Functions in serial_console.c for switching between serial and video
-   consoles.  */
-extern boolean_t	console_is_serial(void);
-extern int		switch_to_serial_console(
-				void);
-
-extern int		switch_to_video_console(
-				void);
-
-extern void		switch_to_old_console(
-				int			old_console);
-
-void serial_keyboard_init(void);
-void serial_keyboard_start(void);
-void serial_keyboard_poll(void);
-
-
 /*
  * JMM - We are not really going to support this driver in SMP (barely
  * support it now - so just pick up the stubbed out versions.
@@ -162,3 +146,5 @@ void serial_keyboard_poll(void);
 					   are time delays	XXX */
 #define	TF_ECHO		0x00000080	/* device wants user to echo input */
 #define	TS_MIN		0x00004000	/* buffer input chars, if possible */
+
+#endif /* _PPC_SERIAL_IO_H_ */