From owner-p4-projects@FreeBSD.ORG  Fri Jan 27 04:38:40 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 EBEB716A423; Fri, 27 Jan 2006 04:38:39 +0000 (GMT)
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 C0B1616A420
	for <perforce@freebsd.org>; Fri, 27 Jan 2006 04:38:39 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6361943D48
	for <perforce@freebsd.org>; Fri, 27 Jan 2006 04:38:39 +0000 (GMT)
	(envelope-from scottl@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 k0R4cdba072034
	for <perforce@freebsd.org>; Fri, 27 Jan 2006 04:38:39 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0R4cdSu072031
	for perforce@freebsd.org; Fri, 27 Jan 2006 04:38:39 GMT
	(envelope-from scottl@freebsd.org)
Date: Fri, 27 Jan 2006 04:38:39 GMT
Message-Id: <200601270438.k0R4cdSu072031@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90450 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: Fri, 27 Jan 2006 04:38:40 -0000

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

Change 90450 by scottl@scottl-junior on 2006/01/27 04:38:05

	Now make it all compile.

Affected files ...

.. //depot/projects/xen3-newbus/src/sys/dev/xen/xenbus/xenbus_probe.c#5 edit

Differences ...

==== //depot/projects/xen3-newbus/src/sys/dev/xen/xenbus/xenbus_probe.c#5 (text+ko) ====

@@ -1052,7 +1052,7 @@
 
 #endif
 
-statuc void
+static void
 xenhub_identify(driver_t *driver, device_t parent)
 {
 	device_t child;
@@ -1200,7 +1200,9 @@
 	return (0);
 }
 
+#if 0
 SYSINIT(xenbus_probe_sysinit, SI_SUB_PSEUDO, SI_ORDER_FIRST, xenbus_probe_sysinit, NULL);
+#endif
 
 static device_method_t xenhub_methods[] = { 
 	/* Device interface */ 
@@ -1218,11 +1220,15 @@
 	DEVMETHOD(bus_add_child,        xenhub_add_child), 
 	DEVMETHOD(bus_read_ivar,        bus_generic_read_ivar), 
 	DEVMETHOD(bus_write_ivar,       bus_generic_write_ivar), 
+#if 0
 	DEVMETHOD(bus_set_resource,     bus_generic_set_resource), 
 	DEVMETHOD(bus_get_resource,     bus_generic_get_resource),
+#endif
 	DEVMETHOD(bus_alloc_resource,   bus_generic_alloc_resource), 
 	DEVMETHOD(bus_release_resource, bus_generic_release_resource), 
+#if 0
 	DEVMETHOD(bus_delete_resource,  bus_generic_delete_resource),
+#endif
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), 
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), 
 	DEVMETHOD(bus_setup_intr,       bus_generic_setup_intr), 
@@ -1231,7 +1237,7 @@
 	{ 0, 0 } 
 }; 
 
-static driver_t xenbus_driver = { 
+static driver_t xenhub_driver = { 
 	"xenhub",
 	xenhub_methods, 
 	sizeof(struct xenbus_device),                      
@@ -1247,7 +1253,7 @@
 };
 
 static int
-xenbus_prob(device_t dev)
+xenbus_probe(device_t dev)
 {
 
 	return (0);
@@ -1264,7 +1270,7 @@
 	sc->xenbus = device_get_ivars(dev);
 
 	/* Enumerate devices in xenstore */
-	xenbus_probe_device(sc->xenbus);
+	xenbus_probe_devices(sc->xenbus);
 
 	return (0);
 }
@@ -1286,7 +1292,7 @@
 	sizeof(struct xenbus_softc),
 };
 
-devclass xenbus_devclass;
+devclass_t xenbus_devclass;
 
 DRIVER_MODULE(xenbus, xenhub, xenbus_driver, xenbus_devclass, 0, 0);