From owner-p4-projects@FreeBSD.ORG  Tue Oct 21 14:17:54 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5A54A1065684; Tue, 21 Oct 2008 14:17:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1993B1065682
	for <perforce@freebsd.org>; Tue, 21 Oct 2008 14:17:54 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 08A418FC0C
	for <perforce@freebsd.org>; Tue, 21 Oct 2008 14:17:54 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9LEHr3K012865
	for <perforce@freebsd.org>; Tue, 21 Oct 2008 14:17:53 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LEHrIB012863
	for perforce@freebsd.org; Tue, 21 Oct 2008 14:17:53 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Tue, 21 Oct 2008 14:17:53 GMT
Message-Id: <200810211417.m9LEHrIB012863@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 151659 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Oct 2008 14:17:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=151659

Change 151659 by nwhitehorn@nwhitehorn_trantor on 2008/10/21 14:16:58

	Make the Mambo serial console do nifty things like actually print when
	it is the console and figure out what baud rate it is running at. This
	should also make the serial console work on Apple G5s.

Affected files ...

.. //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_powerpc.c#3 edit

Differences ...

==== //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_powerpc.c#3 (text) ====

@@ -31,6 +31,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
 
 #include <machine/bus.h>
 
@@ -53,8 +55,7 @@
 int
 uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
 {
-
-	return ((b1->bsh == b2->bsh) ? 1 : 0);
+	return ((pmap_kextract(b1->bsh) == pmap_kextract(b2->bsh)) ? 1 : 0);
 }
 
 #ifdef MPC85XX
@@ -120,9 +121,11 @@
 	if (strcmp(buf, "ch-a") == 0) {
 		class = &uart_z8530_class;
 		di->bas.regshft = 4;
+		di->bas.chan = 1;
 	} else if (strcmp(buf,"serial") == 0) {
 		class = &uart_ns8250_class;
 		di->bas.regshft = 0;
+		di->bas.chan = 0;
 	} else
 		return (ENXIO);
 
@@ -132,12 +135,13 @@
 
 	di->ops = uart_getops(class);
 
-	if (OF_getprop(input, "current-speed", &di->bas.rclk, 
+	if (OF_getprop(input, "clock-frequency", &di->bas.rclk, 
 	    sizeof(di->bas.rclk)) == -1)
 		di->bas.rclk = 230400;
-	di->bas.chan = 1;
+	if (OF_getprop(input, "current-speed", &di->baudrate, 
+	    sizeof(di->baudrate)) == -1)
+		di->baudrate = 0;
 
-	di->baudrate = 0;
 	di->databits = 8;
 	di->stopbits = 1;
 	di->parity = UART_PARITY_NONE;