From owner-p4-projects@FreeBSD.ORG  Sat Jul  5 18:05:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8A9411065672; Sat,  5 Jul 2008 18:05:29 +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 4E108106568C
	for <perforce@freebsd.org>; Sat,  5 Jul 2008 18:05:29 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3CF898FC1A
	for <perforce@freebsd.org>; Sat,  5 Jul 2008 18:05:29 +0000 (UTC)
	(envelope-from marcel@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 m65I5TcJ056556
	for <perforce@freebsd.org>; Sat, 5 Jul 2008 18:05:29 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m65I5T4Y056554
	for perforce@freebsd.org; Sat, 5 Jul 2008 18:05:29 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 5 Jul 2008 18:05:29 GMT
Message-Id: <200807051805.m65I5T4Y056554@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 144729 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, 05 Jul 2008 18:05:29 -0000

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

Change 144729 by marcel@marcel_xcllnt on 2008/07/05 18:05:19

	Declare uart_i8251_class. Since it's weak, we don't
	actually have to have a definition for it. Eliminate
	#ifdef notyet around references to uart_i8251_class.

Affected files ...

.. //depot/projects/uart/dev/uart/uart.h#15 edit
.. //depot/projects/uart/dev/uart/uart_bus_cbus.c#2 edit
.. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#17 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart.h#15 (text+ko) ====

@@ -64,6 +64,7 @@
  */
 struct uart_class;
 
+extern struct uart_class uart_i8251_class __attribute__((weak));
 extern struct uart_class uart_ns8250_class __attribute__((weak));
 extern struct uart_class uart_quicc_class __attribute__((weak));
 extern struct uart_class uart_sab82532_class __attribute__((weak));

==== //depot/projects/uart/dev/uart/uart_bus_cbus.c#2 (text+ko) ====

@@ -62,9 +62,7 @@
 	bus_addr_t iobase;
 	struct uart_class *class;
 } uart_cbus_devs[] = {
-#ifdef notyet
 	{ 0x30, &uart_i8251_class },
-#endif
 	{ 0x238, &uart_ns8250_class },
 	{ 0, NULL }
 };
@@ -103,9 +101,7 @@
 	logical_id = isa_get_logicalid(dev);
 	switch (logical_id) {
 	case 0x0100e4a5:	/* RSA-98III */
-#ifdef notyet
 		sc->sc_class = &uart_rsa_class;
-#endif
 		break;
 	case 0x4180a3b8:	/* PC-9821CB-B04 */
 	case 0x0181a3b8:	/* PC-9821CB2-B04 */
@@ -134,6 +130,9 @@
 		}
 	}
 
+	if (sc->sc_class == NULL)
+		return (ENXIO);
+
 	return (uart_bus_probe(dev, 0, 0, 0, 0));
 }
 

==== //depot/projects/uart/dev/uart/uart_cpu_pc98.c#17 (text+ko) ====

@@ -41,9 +41,7 @@
 	bus_addr_t iobase;
 	struct uart_class *class;
 } uart_cbus_devs[] = {
-#ifdef notyet
 	{ 0x30, &uart_i8251_class },
-#endif
 	{ 0x238, &uart_ns8250_class },
 	{ 0, NULL }
 };
@@ -67,9 +65,7 @@
 	struct uart_class *class;
 	unsigned int i, j, ivar;
 
-	class = &uart_ns8250_class;	/* currently ns8250 only */
-	if (class == NULL)
-		return (ENXIO);
+	class = &uart_i8251_class;
 
 	/* Check the environment. */
 	if (uart_getenv(devtype, di, class) == 0)