PERFORCE change 126961 for review

[Warner Losh]

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

Change 126961 by imp at imp_paco-paco on 2007/09/29 09:22:02

	Kinda flesh out.  It compiles now.

Affected files ...

.. //depot/projects/arm/src/sys/arm/orion/orionreg.h#1 add
.. //depot/projects/arm/src/sys/arm/orion/uart_cpu_orion.c#2 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/orion/uart_cpu_orion.c#2 (text+ko) ====

@@ -39,16 +39,11 @@
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 
-#warning "Need to convert this to real data rather than fake"
-
-#include <arm/at91/at91rm92reg.h>
+#include <arm/orion/orionreg.h>
 
 bus_space_tag_t uart_bus_space_io;
 bus_space_tag_t uart_bus_space_mem;
 
-extern struct uart_class at91_usart_class;
-extern struct bus_space at91_bs_tag;
-
 int
 uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
 {
@@ -60,14 +55,15 @@
 {
 	struct uart_class *class;
 
-	class = &at91_usart_class;
+/*	class = &at91_usart_class; */
 	di->ops = uart_getops(class);
 	di->bas.chan = 0;
-	di->bas.bst = &at91_bs_tag;
+/*	di->bas.bst = &at91_bs_tag; */
 	/* 
 	 * XXX: Not pretty, but will work because we map VA == PA early
 	 * for the last 1MB of memory.
 	 */
+#if 0 /* XXX MAKE REAL */
 	di->bas.bsh = AT91RM92_BASE + AT91RM92_SYS_BASE + DBGU;
 	di->baudrate = 115200;
 	di->bas.regshft = 0;
@@ -77,7 +73,6 @@
 	di->parity = UART_PARITY_NONE;
 	uart_bus_space_io = &at91_bs_tag;
 	uart_bus_space_mem = NULL;
-#if 0
 	/* Check the environment for overrides */
 	uart_getenv(devtype, di, class);
 	return (0);