xnu-1228.3.13.tar.gz

[apple/xnu.git] / osfmk / ppc / serial_io.h

diff --git a/osfmk/ppc/serial_io.h b/osfmk/ppc/serial_io.h
index 3454b6ace955cc89c675a66817bb652dabc05375..a280fa1a4e90299e8c6fd6394bad822395f6ab1d 100644 (file)
--- a/osfmk/ppc/serial_io.h
+++ b/osfmk/ppc/serial_io.h
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -27,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>
 
@@ -102,7 +110,7 @@ extern boolean_t    scc_portdeath(
 
 #endif /* 0 */
 
-extern int             scc_putc(
+extern void            scc_putc(
                                int                     unit,
                                int                     line,
                                int                     c);
@@ -113,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.
@@ -155,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_ */