From owner-p4-projects@FreeBSD.ORG  Sat Mar 19 10:45:04 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5562716A4D0; Sat, 19 Mar 2005 10:45:04 +0000 (GMT)
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 275C916A4CE
	for <perforce@freebsd.org>; Sat, 19 Mar 2005 10:45:04 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 04C9543D39
	for <perforce@freebsd.org>; Sat, 19 Mar 2005 10:45:04 +0000 (GMT)
	(envelope-from jmallett@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 j2JAj37f099749
	for <perforce@freebsd.org>; Sat, 19 Mar 2005 10:45:03 GMT
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2JAj3Df099746
	for perforce@freebsd.org; Sat, 19 Mar 2005 10:45:03 GMT
	(envelope-from jmallett@freebsd.org)
Date: Sat, 19 Mar 2005 10:45:03 GMT
Message-Id: <200503191045.j2JAj3Df099746@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 73515 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: Sat, 19 Mar 2005 10:45:05 -0000

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

Change 73515 by jmallett@jmallett_windward on 2005/03/19 10:44:04

	Attach IMC at arcs_system.  Whee!

Affected files ...

.. //depot/projects/mips/sys/dev/arcs/arcs_system.c#3 edit
.. //depot/projects/mips/sys/mips/sgimips/imc/imc.c#12 edit

Differences ...

==== //depot/projects/mips/sys/dev/arcs/arcs_system.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#2 $
+ * $P4: //depot/projects/mips/sys/dev/arcs/arcs_system.c#3 $
  */
 
 #include <sys/param.h>
@@ -63,10 +63,20 @@
 
 DRIVER_MODULE(arcs_system, arcs, arcs_system_driver, arcs_system_devclass, 0, 0);
 
+static struct mainbus_name {
+	const char *mn_system;
+	const char *mn_device;
+} mainbus_names[] = {
+	{ "SGI-IP22",  		"imc" },
+	{ NULL,			NULL }
+};
+
 static int
 arcs_system_probe(device_t dev)
 {
 	struct ARCS_Component *component, *child;
+	struct mainbus_name *mainbus;
+	const char *system;
 
 	component = device_get_softc(dev);
 	if (component == NULL)
@@ -82,5 +92,10 @@
 	/*
 	 * Attach busses for this system.
 	 */
+	system = arcs_component_identifier(component);
+	for (mainbus = mainbus_names; mainbus->mn_system != NULL; mainbus++) {
+		if (strcmp(mainbus->mn_system, system) == 0)
+			device_add_child(dev, mainbus->mn_device, -1);
+	}
 	return (0);
 }

==== //depot/projects/mips/sys/mips/sgimips/imc/imc.c#12 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#11 $
+ * $P4: //depot/projects/mips/sys/mips/sgimips/imc/imc.c#12 $
  */
 
 #include <sys/cdefs.h>
@@ -203,4 +203,4 @@
 	IMC_WRITE_4(port, IMC_GIO_ERRSTAT, 0);
 }
 
-DRIVER_MODULE(imc, mainbus, imc_driver, imc_devclass, 0, 0);
+DRIVER_MODULE(imc, arcs_system, imc_driver, imc_devclass, 0, 0);