X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e..e2fac8b15b12a7979f72090454d850e612fc5b13:/pexpert/i386/pe_kprintf.c diff --git a/pexpert/i386/pe_kprintf.c b/pexpert/i386/pe_kprintf.c index deb7faee2..84855f63e 100644 --- a/pexpert/i386/pe_kprintf.c +++ b/pexpert/i386/pe_kprintf.c @@ -1,31 +1,29 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved. * - * @APPLE_LICENSE_OSREFERENCE_HEADER_START@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * - * 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. - * - * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and + * 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. + * + * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and * limitations under the License. - * - * @APPLE_LICENSE_OSREFERENCE_HEADER_END@ + * + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* * file: pe_kprintf.c @@ -38,15 +36,10 @@ #include #include -/* 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) @@ -57,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 @@ -89,33 +82,34 @@ 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);