xnu-1228.15.4.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 a39ecf10f48fdf710d90647c4ec8e2bd884f9768..84855f63ec347780278cf2eba30da6a5090a83ce 100644 (file)
--- a/pexpert/i386/pe_kprintf.c
+++ b/pexpert/i386/pe_kprintf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -36,15 +36,10 @@
 #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 */
-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)
 
@@ -55,18 +50,18 @@ void PE_init_kprintf(boolean_t vm_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_argn("debug", &boot_arg, sizeof (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
@@ -87,31 +82,39 @@ static int cpu_last_locked = 0;
 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);
+void
+kprintf_break_lock(void)
+{
+       simple_lock_init(&kprintf_lock, 0);
 }