xnu-1228.5.18.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 a8118fc5a2c57d3016d9587011fefaebed195907..9dffd0de0e19160c0d682613d89d27093ad35ff0 100644 (file)
--- a/pexpert/ppc/pe_kprintf.c
+++ b/pexpert/ppc/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@
  * 
@@ -37,29 +37,26 @@
 #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);
-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];
 
@@ -67,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);
                  }
                }
          }       
@@ -99,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;
 
@@ -132,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, ...)
@@ -149,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);