PERFORCE change 88132 for review

[Warner Losh]

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

Change 88132 by imp at 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;