xnu-3789.51.2.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 d9876f79ff0f6819353abec5d2e389dad21289c7..c6d43f858c4ec88260cc774c7431871694e1111d 100644 (file)
--- a/osfmk/console/serial_general.c
+++ b/osfmk/console/serial_general.c
@@ -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,18 +32,16 @@
  * @APPLE_FREE_COPYRIGHT@
  */
 
  * @APPLE_FREE_COPYRIGHT@
  */
 

-#include <mach_kdb.h>
-#include <platforms.h>

 #include <kern/spl.h>
 #include <mach/std_types.h>
 #include <types.h>
 #include <kern/thread.h>
 #include <console/serial_protos.h>
 #include <kern/spl.h>
 #include <mach/std_types.h>
 #include <types.h>
 #include <kern/thread.h>
 #include <console/serial_protos.h>

+#include <libkern/section_keywords.h>

 
 

-extern unsigned int disableSerialOuput;

 extern void cons_cinput(char ch);              /* The BSD routine that gets characters */
 
 extern void cons_cinput(char ch);              /* The BSD routine that gets characters */
 

-unsigned int serialmode;                               /* Serial mode keyboard and console control */
+SECURITY_READ_ONLY_LATE(unsigned int) serialmode;                              /* Serial mode keyboard and console control */

 
 /*
  *  This routine will start a thread that polls the serial port, listening for
 
 /*
  *  This routine will start a thread that polls the serial port, listening for


@@ -56,7 +54,8 @@ serial_keyboard_init(void)
        kern_return_t   result;
        thread_t                thread;
 
        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);
 
        kprintf("Serial keyboard started\n");
        result = kernel_thread_start_priority((thread_continue_t)serial_keyboard_start, NULL, MAXPRI_KERNEL, &thread);


@@ -69,10 +68,9 @@ serial_keyboard_init(void)
 void
 serial_keyboard_start(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");
        panic("serial_keyboard_start: we can't get back here\n");

-

 }
 
 void
 }
 
 void


@@ -81,10 +79,10 @@ serial_keyboard_poll(void)
        int chr;
        uint64_t next;
 
        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 */
                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 */
        }
 
                cons_cinput((char)chr);                 /* Buffer up the character */
        }
 


@@ -95,13 +93,14 @@ serial_keyboard_poll(void)
        panic("serial_keyboard_poll: Shouldn't never ever get here...\n");
 }
 
        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
 }
 
 int

-switch_to_video_console()
+switch_to_video_console(void)

 {
        int old_cons_ops = cons_ops_index;
        cons_ops_index = VC_CONS_OPS;
 {
        int old_cons_ops = cons_ops_index;
        cons_ops_index = VC_CONS_OPS;


@@ -109,7 +108,7 @@ switch_to_video_console()
 }
 
 int
 }
 
 int

-switch_to_serial_console()
+switch_to_serial_console(void)

 {
        int old_cons_ops = cons_ops_index;
        cons_ops_index = SERIAL_CONS_OPS;
 {
        int old_cons_ops = cons_ops_index;
        cons_ops_index = SERIAL_CONS_OPS;