From owner-p4-projects@FreeBSD.ORG  Sun Jul  6 15:52:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B7181065689; Sun,  6 Jul 2008 15:52:57 +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 D55FE1065684
	for <perforce@freebsd.org>; Sun,  6 Jul 2008 15:52:56 +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 C19C08FC1F
	for <perforce@freebsd.org>; Sun,  6 Jul 2008 15:52:56 +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 m66FqumH041496
	for <perforce@freebsd.org>; Sun, 6 Jul 2008 15:52:56 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66Fqugh041494
	for perforce@freebsd.org; Sun, 6 Jul 2008 15:52:56 GMT
	(envelope-from marcel@freebsd.org)
Date: Sun, 6 Jul 2008 15:52:56 GMT
Message-Id: <200807061552.m66Fqugh041494@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 144785 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: Sun, 06 Jul 2008 15:52:57 -0000

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

Change 144785 by marcel@marcel_xcllnt on 2008/07/06 15:52:13

	The RSA-98III is actually a ns8250 class UART.

Affected files ...

.. //depot/projects/uart/dev/uart/uart_bus_isa.c#12 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart_bus_isa.c#12 (text+ko) ====

@@ -65,6 +65,7 @@
 	{0x0205d041, "Multiport serial device (non-intelligent 16550)"}, /* PNP0502 */
 	{0x1005d041, "Generic IRDA-compatible device"},	/* PNP0510 */
 	{0x1105d041, "Generic IRDA-compatible device"},	/* PNP0511 */
+	{0x0100e4a5, "RSA-98III"},
 	/* Devices that do not have a compatid */
 	{0x12206804, NULL},     /* ACH2012 - 5634BTS 56K Video Ready Modem */
 	{0x7602a904, NULL},	/* AEI0276 - 56K v.90 Fax Modem (LKT) */
@@ -159,11 +160,6 @@
 	{0}
 };
 
-static struct isa_pnp_id isa_i8251_ids[] = {
-	{0x0100e4a5, "RSA-98III"},
-	{0}
-};
-
 static int
 uart_isa_probe(device_t dev)
 {
@@ -179,11 +175,7 @@
 		return (uart_bus_probe(dev, 0, 0, 0, 0));
 	}
 
-	/* Probe PnP _and_ non-PnP i8251 here. */
-	if (ISA_PNP_PROBE(parent, dev, isa_i8251_ids) != ENXIO) {
-		sc->sc_class = &uart_i8251_class;
-		return (uart_bus_probe(dev, 0, 0, 0, 0));
-	}
+	/* Add checks for non-ns8250 IDs here. */
 
 #ifdef PC98
 	sc->sc_class = uart_pc98_getdev(bus_get_resource_start(dev,