xnu-3789.70.16.tar.gz

[apple/xnu.git] / osfmk / console / serial_protos.h

diff --git a/osfmk/console/serial_protos.h b/osfmk/console/serial_protos.h
index 4d6279d70e2ea03d6122ad5388ce23c9b9626be7..cf372f624560bb985d56860f93d2c43bcf36870e 100644 (file)
--- a/osfmk/console/serial_protos.h
+++ b/osfmk/console/serial_protos.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -26,7 +32,8 @@
  * @APPLE_FREE_COPYRIGHT@
  */
 
-
+#ifndef _CONSOLE_SERIAL_PROTOS_H_
+#define _CONSOLE_SERIAL_PROTOS_H_
 
 void serial_keyboard_init(void);
 void serial_keyboard_start(void);
@@ -34,21 +41,22 @@ void serial_keyboard_poll(void);
 
 extern uint32_t serialmode;
 extern uint32_t cons_ops_index;
-extern uint32_t nconsops;
+extern const uint32_t nconsops;
+extern unsigned int disable_serial_output;
 
-extern int _serial_getc(int unit, int line, boolean_t wait, boolean_t raw);
-
-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);
+int _serial_getc(int unit, int line, boolean_t wait, boolean_t raw);
 
 struct console_ops {
-       int     (*putc)(int, int, int);
+       void    (*putc)(int, int, int);
        int     (*getc)(int, int, boolean_t, boolean_t);
-} console_ops;
-typedef struct console_ops console_ops_t;
+};
 
+boolean_t console_is_serial(void);
+int switch_to_serial_console(void);
+int switch_to_video_console(void);
+void switch_to_old_console(int old_console);
 
 #define SERIAL_CONS_OPS 0
 #define VC_CONS_OPS 1
+
+#endif /* _CONSOLE_SERIAL_PROTOS_H_ */