xnu-1228.tar.gz

[apple/xnu.git] / pexpert / i386 / pe_kprintf.c

diff --git a/pexpert/i386/pe_kprintf.c b/pexpert/i386/pe_kprintf.c
index 5501f3ddbec2df9352aa088f6622fac69c0b1e14..7db76a179626553c4ba6c92f0396ab166c75e0fd 100644 (file)
--- a/pexpert/i386/pe_kprintf.c
+++ b/pexpert/i386/pe_kprintf.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-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,
  * 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@

  */
 /*
  * file: pe_kprintf.c
  */
 /*
  * file: pe_kprintf.c


@@ -30,15 +36,10 @@
 #include <kern/simple_lock.h>
 #include <i386/mp.h>
 
 #include <kern/simple_lock.h>
 #include <i386/mp.h>
 

-/* extern references */
-extern void cnputc(char c);
-extern int  serial_init(void);
-extern void serial_putc(char c);
-

 /* Globals */
 /* Globals */

-void (*PE_kputc)(char c) = 0;
+void (*PE_kputc)(char c);

 
 

-unsigned int disableSerialOuput = TRUE;
+unsigned int disable_serial_output = TRUE;

 
 decl_simple_lock_data(static, kprintf_lock)
 
 
 decl_simple_lock_data(static, kprintf_lock)
 


@@ -49,18 +50,18 @@ void PE_init_kprintf(boolean_t vm_initialized)
        if (PE_state.initialized == FALSE)
                panic("Platform Expert not initialized");
 
        if (PE_state.initialized == FALSE)
                panic("Platform Expert not initialized");
 

-       if (!vm_initialized)
-       {
-        simple_lock_init(&kprintf_lock, 0);
+       if (!vm_initialized) {
+               simple_lock_init(&kprintf_lock, 0);

 
 

-           if (PE_parse_boot_arg("debug", &boot_arg)) 
-               if (boot_arg & DB_KPRT) disableSerialOuput = FALSE;
+               if (PE_parse_boot_arg("debug", &boot_arg))
+                       if (boot_arg & DB_KPRT)
+                               disable_serial_output = FALSE;

 
 

-        if (!disableSerialOuput && serial_init())
-            PE_kputc = serial_putc;
-        else
-            PE_kputc = cnputc;
-    }
+               if (!disable_serial_output && serial_init())
+                       PE_kputc = serial_putc;
+               else
+                       PE_kputc = cnputc;
+       }

 }
 
 #ifdef MP_DEBUG
 }
 
 #ifdef MP_DEBUG


@@ -81,33 +82,34 @@ static int cpu_last_locked = 0;
 void kprintf(const char *fmt, ...)
 {
        va_list   listp;
 void kprintf(const char *fmt, ...)
 {
        va_list   listp;

-    boolean_t state;
-    
-    if (!disableSerialOuput) {
-
-       /*
-        * Spin to get kprintf lock but re-enable interrupts while failing.
-        * This allows interrupts to be handled while waiting but
-        * interrupts are disabled once we have the lock.
-        */
-       state = ml_set_interrupts_enabled(FALSE);
-       while (!simple_lock_try(&kprintf_lock)) {
-             ml_set_interrupts_enabled(state);
-             ml_set_interrupts_enabled(FALSE);
-       }
-
-       if (cpu_number() != cpu_last_locked) {
-           MP_DEBUG_KPRINTF("[cpu%d...]\n", cpu_number());
-           cpu_last_locked = cpu_number();
+       boolean_t state;
+
+       if (!disable_serial_output) {
+
+               /*
+                * Spin to get kprintf lock but re-enable interrupts while
+                * failing.
+                * This allows interrupts to be handled while waiting but
+                * interrupts are disabled once we have the lock.
+                */
+               state = ml_set_interrupts_enabled(FALSE);
+               while (!simple_lock_try(&kprintf_lock)) {
+                       ml_set_interrupts_enabled(state);
+                       ml_set_interrupts_enabled(FALSE);
+               }
+
+               if (cpu_number() != cpu_last_locked) {
+                       MP_DEBUG_KPRINTF("[cpu%d...]\n", cpu_number());
+                       cpu_last_locked = cpu_number();
+               }
+
+               va_start(listp, fmt);
+               _doprnt(fmt, &listp, PE_kputc, 16);
+               va_end(listp);
+
+               simple_unlock(&kprintf_lock);
+               ml_set_interrupts_enabled(state);

        }
        }

-
-        va_start(listp, fmt);
-        _doprnt(fmt, &listp, PE_kputc, 16);
-        va_end(listp);
-
-        simple_unlock(&kprintf_lock);
-        ml_set_interrupts_enabled(state);
-    }

 }
 
 extern void kprintf_break_lock(void);
 }
 
 extern void kprintf_break_lock(void);