From owner-p4-projects@FreeBSD.ORG  Wed Apr 26 21:54:01 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5087316A46A; Wed, 26 Apr 2006 21:54:01 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 1703D16A467
	for <perforce@freebsd.org>; Wed, 26 Apr 2006 21:54:01 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A960A43D60
	for <perforce@freebsd.org>; Wed, 26 Apr 2006 21:54:00 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3QLs07q063497
	for <perforce@freebsd.org>; Wed, 26 Apr 2006 21:54:00 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3QLs0Ig063491
	for perforce@freebsd.org; Wed, 26 Apr 2006 21:54:00 GMT
	(envelope-from marcel@freebsd.org)
Date: Wed, 26 Apr 2006 21:54:00 GMT
Message-Id: <200604262154.k3QLs0Ig063491@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 96168 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: Wed, 26 Apr 2006 21:54:01 -0000

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

Change 96168 by marcel@marcel_nfs on 2006/04/26 21:53:10

	Update the puc(4) bus attachment according to the new world
	order. Return BUS_PROBE_LOW_PRIORITY to allow uart(4) to
	take advantage of the serdev I/F.

Affected files ...

.. //depot/projects/uart/dev/sio/sio_puc.c#5 edit

Differences ...

==== //depot/projects/uart/dev/sio/sio_puc.c#5 (text+ko) ====

@@ -39,8 +39,8 @@
 #include <machine/bus.h>
 #include <sys/timepps.h>
 
-#include <dev/pci/pcivar.h>
-#include <dev/puc/pucvar.h>
+#include <dev/puc/puc_bus.h>
+
 #include <dev/sio/siovar.h>
 #include <dev/sio/sioreg.h>
 
@@ -63,30 +63,37 @@
 };
 
 static int
-sio_puc_attach(dev)
-	device_t	dev;
+sio_puc_attach(device_t dev)
 {
 	uintptr_t rclk;
 
-	if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ,
+	if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_CLOCK,
 	    &rclk) != 0)
 		rclk = DEFAULT_RCLK;
 	return (sioattach(dev, 0, rclk));
 }
 
 static int
-sio_puc_probe(dev)
-	device_t	dev;
+sio_puc_probe(device_t dev)
 {
-	uintptr_t rclk;
+	device_t parent;
+	uintptr_t rclk, type;
+	int error;
+
+	parent = device_get_parent(dev);
+
+	if (BUS_READ_IVAR(parent, dev, PUC_IVAR_TYPE, &type))
+		return (ENXIO);
+	if (type != PUC_TYPE_SERIAL)
+		return (ENXIO);
 
-	if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ,
-	    &rclk) != 0)
+	if (BUS_READ_IVAR(parent, dev, PUC_IVAR_CLOCK, &rclk))
 		rclk = DEFAULT_RCLK;
 #ifdef PC98
 	SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550));
 #endif
-	return (sioprobe(dev, 0, rclk, 1));
+	error = sioprobe(dev, 0, rclk, 1);
+	return ((error > 0) ? error : BUS_PROBE_LOW_PRIORITY);
 }
 
 DRIVER_MODULE(sio, puc, sio_puc_driver, sio_devclass, 0, 0);