From owner-p4-projects@FreeBSD.ORG  Thu Sep 25 20:01:55 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 397FF16A4C0; Thu, 25 Sep 2003 20:01:55 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 128FE16A4B3
	for <perforce@freebsd.org>; Thu, 25 Sep 2003 20:01:55 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8CA1343FDF
	for <perforce@freebsd.org>; Thu, 25 Sep 2003 20:01:54 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8Q31sXJ059659
	for <perforce@freebsd.org>; Thu, 25 Sep 2003 20:01:54 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8Q31sgY059656
	for perforce@freebsd.org; Thu, 25 Sep 2003 20:01:54 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Date: Thu, 25 Sep 2003 20:01:54 -0700 (PDT)
Message-Id: <200309260301.h8Q31sgY059656@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>
Subject: PERFORCE change 38612 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 26 Sep 2003 03:01:55 -0000

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

Change 38612 by marcel@marcel_nfs on 2003/09/25 20:01:32

	Only set the channel for sab82532 and z8530. The ns8250
	is not multi-channeled.

Affected files ...

.. //depot/projects/uart/dev/uart/uart_bus_puc.c#9 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart_bus_puc.c#9 (text+ko) ====

@@ -73,19 +73,22 @@
 	switch (type) {
 	case PUC_PORT_UART_NS8250:
 		sc->sc_class = &uart_ns8250_class;
+		port = 0;
 		break;
 	case PUC_PORT_UART_SAB82532:
 		sc->sc_class = &uart_sab82532_class;
+		if (BUS_READ_IVAR(parent, dev, PUC_IVAR_PORT, &port))
+			port = 0;
 		break;
 	case PUC_PORT_UART_Z8530:
 		sc->sc_class = &uart_z8530_class;
+		if (BUS_READ_IVAR(parent, dev, PUC_IVAR_PORT, &port))
+			port = 0;
 		break;
 	default:
 		return (ENXIO);
 	}
 
-	if (BUS_READ_IVAR(parent, dev, PUC_IVAR_PORT, &port))
-		port = 0;
 	if (BUS_READ_IVAR(parent, dev, PUC_IVAR_FREQ, &rclk))
 		rclk = 0;
 	if (BUS_READ_IVAR(parent, dev, PUC_IVAR_REGSHFT, &regshft))