xnu-792.22.5.tar.gz

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

diff --git a/pexpert/ppc/pe_kprintf.c b/pexpert/ppc/pe_kprintf.c
index 02a62efd6d471a2898f2b4d8da6ea04b4a3948a6..922291fa068deff07357a38e6778e9a5bec50fbc 100644 (file)
--- a/pexpert/ppc/pe_kprintf.c
+++ b/pexpert/ppc/pe_kprintf.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -20,7 +23,7 @@
  * 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,8 +34,10 @@
 #include <pexpert/protos.h>
 #include <pexpert/pexpert.h>
 #include <pexpert/ppc/powermac.h>
+#include <pexpert/device_tree.h>
 #include <kern/debug.h>
 #include <kern/simple_lock.h>
+#include <vm/pmap.h>
 
 /* extern references */
 extern void init_display_putc(unsigned char*, int, int);
@@ -55,16 +60,48 @@ struct slock kprintf_lock;
 void PE_init_kprintf(boolean_t vm_initialized)
 {
        unsigned int    boot_arg;
+       int32_t                 cnt, size, serial_baud = -1;
+       DTEntry         options;
+       char            *str, baud[7];
 
        if (PE_state.initialized == FALSE)
                panic("Platform Expert not initialized");
 
-       if (PE_parse_boot_arg("debug", &boot_arg)) 
+       if (PE_parse_boot_arg("debug", &boot_arg))
                if(boot_arg & DB_KPRT) disableSerialOuput = FALSE; 
 
+       if (DTLookupEntry(0, "/options", &options) == kSuccess) {
+         if (DTGetProperty(options, "input-device", &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);
+                 }
+               }
+         }
+         if (DTGetProperty(options, "output-device", &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);
+                 }
+               }
+         }       
+       }
+
+       /* Check the boot-args for new serial baud. */
+       if (PE_parse_boot_arg("serialbaud", &serial_baud))
+               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 */
-               initialize_serial((void *)scc);                 /* Start up the serial driver */
+               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;
 
                simple_lock_init(&kprintf_lock, 0);