xnu-1228.12.14.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 7f794c565691d4e7ed720e966309db380b43be93..a280fa1a4e90299e8c6fd6394bad822395f6ab1d 100644 (file)
--- a/osfmk/ppc/serial_io.h
+++ b/osfmk/ppc/serial_io.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -32,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>
 
@@ -107,7 +110,7 @@ extern boolean_t    scc_portdeath(
 
 #endif /* 0 */
 
-extern int             scc_putc(
+extern void            scc_putc(
                                int                     unit,
                                int                     line,
                                int                     c);
@@ -118,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.
@@ -160,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_ */