From owner-p4-projects@FreeBSD.ORG  Thu Jan 11 02:11:01 2007
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 A431016A504; Thu, 11 Jan 2007 02:11:01 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6702C16A501
	for <perforce@freebsd.org>; Thu, 11 Jan 2007 02:11:01 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 54B1013C44B
	for <perforce@freebsd.org>; Thu, 11 Jan 2007 02:11:01 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0B2B1EE023600
	for <perforce@freebsd.org>; Thu, 11 Jan 2007 02:11:01 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0B2B1sl023597
	for perforce@freebsd.org; Thu, 11 Jan 2007 02:11:01 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 11 Jan 2007 02:11:01 GMT
Message-Id: <200701110211.l0B2B1sl023597@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112755 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: Thu, 11 Jan 2007 02:11:01 -0000

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

Change 112755 by peter@peter_overcee on 2007/01/11 02:10:31

	Ignore the warnings and copy this bit of necessary code to avoid
	sio unit numbers from sio_pci to sio_puc.  Marcel left this out in
	the great puc rewrite.

Affected files ...

.. //depot/projects/hammer/sys/dev/sio/sio_puc.c#8 edit

Differences ...

==== //depot/projects/hammer/sys/dev/sio/sio_puc.c#8 (text+ko) ====

@@ -62,6 +62,34 @@
 	0,
 };
 
+/*
+ * Don't cut and paste this to other drivers.  It is a horrible kludge
+ * which will fail to work and also be unnecessary in future versions.
+ */
+static void
+sio_puc_kludge_unit(device_t dev)
+{
+	devclass_t	dc;
+	int		err;
+	int		start;
+	int		unit;
+
+	unit = 0;
+	start = 0;
+	while (resource_int_value("sio", unit, "port", &start) == 0 && 
+	    start > 0)
+		unit++;
+	if (device_get_unit(dev) < unit) {
+		dc = device_get_devclass(dev);
+		while (devclass_get_device(dc, unit))
+			unit++;
+		device_printf(dev, "moving to sio%d\n", unit);
+		err = device_set_unit(dev, unit);	/* EVIL DO NOT COPY */
+		if (err)
+			device_printf(dev, "error moving device %d\n", err);
+	}
+}
+
 static int
 sio_puc_attach(device_t dev)
 {
@@ -70,6 +98,7 @@
 	if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_CLOCK,
 	    &rclk) != 0)
 		rclk = DEFAULT_RCLK;
+	sio_puc_kludge_unit(dev);
 	return (sioattach(dev, 0, rclk));
 }