From owner-p4-projects@FreeBSD.ORG  Tue Jan 29 16:41:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D538616A468; Tue, 29 Jan 2008 16:41:34 +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 98FE216A417
	for <perforce@freebsd.org>; Tue, 29 Jan 2008 16:41:34 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 88B0913C442
	for <perforce@freebsd.org>; Tue, 29 Jan 2008 16:41:34 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0TGfYnd076929
	for <perforce@freebsd.org>; Tue, 29 Jan 2008 16:41:34 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TGfYgJ076926
	for perforce@freebsd.org; Tue, 29 Jan 2008 16:41:34 GMT
	(envelope-from rrs@cisco.com)
Date: Tue, 29 Jan 2008 16:41:34 GMT
Message-Id: <200801291641.m0TGfYgJ076926@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rrs@cisco.com using -f
From: "Randall R. Stewart" <rrs@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134380 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, 29 Jan 2008 16:41:35 -0000

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

Change 134380 by rrs@rrs-mips2-jnpr on 2008/01/29 16:40:52

	fixes so it calls the uart_getenv

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_cpu_octeonusart.c#5 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_cpu_octeonusart.c#5 (text+ko) ====

@@ -67,9 +67,12 @@
 int
 uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 {
-	di->ops = uart_getops(&uart_oct16550_class);
+	struct uart_class *class;
+
+	class = &uart_oct16550_class;
+	di->ops = uart_getops(class);
+	di->bas.bst = 0;
 	di->bas.chan = 0;
-	di->bas.bst = 0;
 	di->bas.regshft = 3;	/* Each UART reg is 8 byte addresss apart.  1
 				 * << 3 */
 	di->bas.rclk = 0;
@@ -81,5 +84,6 @@
 	uart_bus_space_io = MIPS_PHYS_TO_KSEG1(OCTEON_UART0ADR);
 	uart_bus_space_mem = MIPS_PHYS_TO_KSEG1(OCTEON_UART0ADR);
 	di->bas.bsh = OCTEON_UART0ADR;
+	uart_getenv(devtype, di, class);
 	return (0);
 }