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 d5296a683876fb5e84e4202584701176dde2a9c6..cf372f624560bb985d56860f93d2c43bcf36870e 100644 (file)
--- a/osfmk/console/serial_protos.h
+++ b/osfmk/console/serial_protos.h
@@ -1,5 +1,5 @@
 /*
 /*

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

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


@@ -32,7 +32,8 @@
  * @APPLE_FREE_COPYRIGHT@
  */
 
  * @APPLE_FREE_COPYRIGHT@
  */
 

-
+#ifndef _CONSOLE_SERIAL_PROTOS_H_
+#define _CONSOLE_SERIAL_PROTOS_H_

 
 void serial_keyboard_init(void);
 void serial_keyboard_start(void);
 
 void serial_keyboard_init(void);
 void serial_keyboard_start(void);


@@ -40,21 +41,22 @@ void serial_keyboard_poll(void);
 
 extern uint32_t serialmode;
 extern uint32_t cons_ops_index;
 
 extern uint32_t serialmode;
 extern uint32_t cons_ops_index;

-extern uint32_t nconsops;
-
-extern int _serial_getc(int unit, int line, boolean_t wait, boolean_t raw);
+extern const uint32_t nconsops;
+extern unsigned int disable_serial_output;

 
 

-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 {
 
 struct console_ops {

-       int     (*putc)(int, int, int);
+       void    (*putc)(int, int, int);

        int     (*getc)(int, int, boolean_t, boolean_t);
        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
 
 #define SERIAL_CONS_OPS 0
 #define VC_CONS_OPS 1

+
+#endif /* _CONSOLE_SERIAL_PROTOS_H_ */