X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6601e61aa18bf4f09af135ff61fc7f4771d23b06..cf7d32b81c573a0536dc4da4157f9c26f8d0bed3:/pexpert/ppc/pe_kprintf.c?ds=sidebyside diff --git a/pexpert/ppc/pe_kprintf.c b/pexpert/ppc/pe_kprintf.c index e8713ce46..9dffd0de0 100644 --- a/pexpert/ppc/pe_kprintf.c +++ b/pexpert/ppc/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, - * 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 @@ -31,29 +37,26 @@ #include #include #include +#include /* extern references */ -extern void init_display_putc(unsigned char*, int, int); -extern void display_putc(char c); -extern int scc_putc(int unit, int line, int c); -extern void cnputc(char c); - -/* Internal routines -- eventually put this in serial driver */ -void serial_putc(char c); +extern void scc_putc(int unit, int line, int c); +extern long strtol(const char *, char **, int); /* Globals */ -void (*PE_kputc)(char c) = 0; +void (*PE_kputc)(char c); -unsigned int disableSerialOuput = TRUE; +unsigned int disable_serial_output = TRUE; vm_offset_t scc = 0; struct slock kprintf_lock; -void PE_init_kprintf(boolean_t vm_initialized) +void PE_init_kprintf(__unused boolean_t vm_initialized) { unsigned int boot_arg; - int32_t cnt, size, serial_baud = -1; + int32_t serial_baud = -1; + unsigned int size; DTEntry options; char *str, baud[7]; @@ -61,28 +64,28 @@ void PE_init_kprintf(boolean_t vm_initialized) panic("Platform Expert not initialized"); if (PE_parse_boot_arg("debug", &boot_arg)) - if(boot_arg & DB_KPRT) disableSerialOuput = FALSE; + if(boot_arg & DB_KPRT) disable_serial_output = FALSE; - if (DTLookupEntry(0, "/options", &options) == kSuccess) { - if (DTGetProperty(options, "input-device", &str, &size) == kSuccess) { + if (DTLookupEntry(NULL, "/options", &options) == kSuccess) { + if (DTGetProperty(options, "input-device", (void **)&str, &size) == kSuccess) { if ((size > 5) && !strncmp("scca:", str, 5)) { size -= 5; str += 5; if (size <= 6) { strncpy(baud, str, size); baud[size] = '\0'; - gPESerialBaud = strtol(baud, 0, 0); + gPESerialBaud = strtol(baud, NULL, 0); } } } - if (DTGetProperty(options, "output-device", &str, &size) == kSuccess) { + if (DTGetProperty(options, "output-device", (void **)&str, &size) == kSuccess) { if ((size > 5) && !strncmp("scca:", str, 5)) { size -= 5; str += 5; if (size <= 6) { strncpy(baud, str, size); baud[size] = '\0'; - gPESerialBaud = strtol(baud, 0, 0); + gPESerialBaud = strtol(baud, NULL, 0); } } } @@ -93,7 +96,7 @@ void PE_init_kprintf(boolean_t vm_initialized) if (serial_baud != -1) gPESerialBaud = serial_baud; if( (scc = PE_find_scc())) { /* See if we can find the serial port */ - scc = io_map_spec(scc, 0x1000); /* Map it in */ + scc = io_map_spec(scc, 0x1000, VM_WIMG_IO); /* Map it in */ initialize_serial((void *)scc, gPESerialBaud); /* Start up the serial driver */ PE_kputc = serial_putc; @@ -126,13 +129,9 @@ void PE_init_kprintf(boolean_t vm_initialized) void serial_putc(char c) { - (void) scc_putc(0, 1, c); - if (c == '\n') (void) scc_putc(0, 1, '\r'); - -#if 0 - (void) scc_putc(0, (int)PE_state.debug_video.v_baseAddr, c); - if (c == '\n') (void) scc_putc(0, (int)PE_state.debug_video.v_baseAddr, '\r'); -#endif + scc_putc(0, 1, c); + if (c == '\n') + scc_putc(0, 1, '\r'); } void kprintf(const char *fmt, ...) @@ -143,7 +142,7 @@ void kprintf(const char *fmt, ...) state = ml_set_interrupts_enabled(FALSE); simple_lock(&kprintf_lock); - if (!disableSerialOuput) { + if (!disable_serial_output) { va_start(listp, fmt); _doprnt(fmt, &listp, PE_kputc, 16); va_end(listp);