xnu-1699.26.8.tar.gz

[apple/xnu.git] / osfmk / console / serial_general.c

diff --git a/osfmk/console/serial_general.c b/osfmk/console/serial_general.c
index 16ce74940152af0353804347cf1cf3ce92d994ed..d51e98dabe32ec12153dc5e16a0353a6c3d9049d 100644 (file)
--- a/osfmk/console/serial_general.c
+++ b/osfmk/console/serial_general.c
@@ -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@
@@ -34,7 +40,6 @@
 #include <kern/thread.h>
 #include <console/serial_protos.h>
 
-extern unsigned int disableSerialOuput;
 extern void cons_cinput(char ch);              /* The BSD routine that gets characters */
 
 unsigned int serialmode;                               /* Serial mode keyboard and console control */
@@ -50,7 +55,8 @@ serial_keyboard_init(void)
        kern_return_t   result;
        thread_t                thread;
 
-       if(!(serialmode & 2)) return;           /* Leave if we do not want a serial console */
+       if(!(serialmode & 2)) /* Leave if we do not want a serial console */
+               return;
 
        kprintf("Serial keyboard started\n");
        result = kernel_thread_start_priority((thread_continue_t)serial_keyboard_start, NULL, MAXPRI_KERNEL, &thread);
@@ -63,10 +69,9 @@ serial_keyboard_init(void)
 void
 serial_keyboard_start(void)
 {
-
-       serial_keyboard_poll();                         /* Go see if there are any characters pending now */
+       /* Go see if there are any characters pending now */
+       serial_keyboard_poll();
        panic("serial_keyboard_start: we can't get back here\n");
-
 }
 
 void
@@ -75,10 +80,10 @@ serial_keyboard_poll(void)
        int chr;
        uint64_t next;
 
-
-       while(1) {                                                      /* Do this for a while */
+       while(1) {
                chr = _serial_getc(0, 1, 0, 1); /* Get a character if there is one */
-               if(chr < 0) break;                              /* The serial buffer is empty */
+               if(chr < 0) /* The serial buffer is empty */
+                       break;
                cons_cinput((char)chr);                 /* Buffer up the character */
        }
 
@@ -89,13 +94,14 @@ serial_keyboard_poll(void)
        panic("serial_keyboard_poll: Shouldn't never ever get here...\n");
 }
 
-boolean_t console_is_serial()
+boolean_t
+console_is_serial(void)
 {
-       return cons_ops_index == SERIAL_CONS_OPS;
+       return (cons_ops_index == SERIAL_CONS_OPS);
 }
 
 int
-switch_to_video_console()
+switch_to_video_console(void)
 {
        int old_cons_ops = cons_ops_index;
        cons_ops_index = VC_CONS_OPS;
@@ -103,7 +109,7 @@ switch_to_video_console()
 }
 
 int
-switch_to_serial_console()
+switch_to_serial_console(void)
 {
        int old_cons_ops = cons_ops_index;
        cons_ops_index = SERIAL_CONS_OPS;