From owner-p4-projects@FreeBSD.ORG  Tue Dec 13 17:24:44 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C402116A423; Tue, 13 Dec 2005 17:24:43 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 98A8116A41F
	for <perforce@freebsd.org>; Tue, 13 Dec 2005 17:24:43 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 467DE43D60
	for <perforce@freebsd.org>; Tue, 13 Dec 2005 17:24:43 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDHOhqB070235
	for <perforce@freebsd.org>; Tue, 13 Dec 2005 17:24:43 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDHOgb5070232
	for perforce@freebsd.org; Tue, 13 Dec 2005 17:24:42 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 13 Dec 2005 17:24:42 GMT
Message-Id: <200512131724.jBDHOgb5070232@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 88132 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, 13 Dec 2005 17:24:44 -0000

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

Change 88132 by imp@imp_Speedy on 2005/12/13 17:24:40

	Allow uart_getenv to override defaults

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm92usart.c#5 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm92usart.c#5 (text+ko) ====

@@ -50,20 +50,9 @@
 	return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0);
 }
 
-#define CONSOLE_USART
 int
 uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 {
-#if 0
-	/*
-	 * We can't enable this yet since it is ns8250 specific
-	 * at the moment.
-	 */
-	/* Check the environment. */
-	if (uart_getenv(devtype, di) == 0)
-		return (0);
-#endif
-#ifdef CONSOLE_USART
 	di->ops = usart_at91rm92_ops;
 	di->bas.chan = 0;
 	di->bas.bst = &at91rm92_bs_tag;
@@ -78,7 +67,10 @@
 	di->databits = 8;
 	di->stopbits = 1;
 	di->parity = UART_PARITY_NONE;
-#endif
+	/* Check the environment for overrides */
+	if (uart_getenv(devtype, di) == 0)
+		return (0);
+
 	uart_bus_space_io = &at91rm92_bs_tag;
 	uart_bus_space_mem = NULL;