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 34af7efc743a94ce3ccba0f19ef5d894ba5929b9..a280fa1a4e90299e8c6fd6394bad822395f6ab1d 100644 (file)
--- a/osfmk/ppc/serial_io.h
+++ b/osfmk/ppc/serial_io.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -32,7 +32,10 @@
  * @APPLE_FREE_COPYRIGHT@
  */
 
  * @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>
 
 #include <device/device_types.h>
 #include <mach_kdp.h>
 


@@ -107,7 +110,7 @@ extern boolean_t    scc_portdeath(
 
 #endif /* 0 */
 
 
 #endif /* 0 */
 

-extern int             scc_putc(
+extern void            scc_putc(

                                int                     unit,
                                int                     line,
                                int                     c);
                                int                     unit,
                                int                     line,
                                int                     c);


@@ -118,8 +121,6 @@ extern int          scc_getc(
                                boolean_t               wait,
                                boolean_t               raw);
 
                                boolean_t               wait,
                                boolean_t               raw);
 

-
-

 /*
  * JMM - We are not really going to support this driver in SMP (barely
  * support it now - so just pick up the stubbed out versions.
 /*
  * JMM - We are not really going to support this driver in SMP (barely
  * support it now - so just pick up the stubbed out versions.


@@ -145,3 +146,5 @@ extern int          scc_getc(
                                           are time delays      XXX */
 #define        TF_ECHO         0x00000080      /* device wants user to echo input */
 #define        TS_MIN          0x00004000      /* buffer input chars, if possible */
                                           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_ */