From owner-p4-projects@FreeBSD.ORG  Sat Sep 29 09:22:38 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3382E16A421; Sat, 29 Sep 2007 09:22:38 +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 6DA1D16A419
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 09:22:37 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 61C4913C46A
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 09:22:37 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8T9MbhW052687
	for <perforce@freebsd.org>; Sat, 29 Sep 2007 09:22:37 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8T9MbgE052684
	for perforce@freebsd.org; Sat, 29 Sep 2007 09:22:37 GMT
	(envelope-from imp@freebsd.org)
Date: Sat, 29 Sep 2007 09:22:37 GMT
Message-Id: <200709290922.l8T9MbgE052684@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 126961 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: Sat, 29 Sep 2007 09:22:38 -0000

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

Change 126961 by imp@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);