Remove xhub boilerplate; Hub doesn't appear as a widget itself but as the

connecting part of the XBow, as advertized by the KL graph. Hub specific
code already exists in xbow.c and will remain there.

2 files changed, 1 insertions, 78 deletions

diff --git a/sys/arch/sgi/xbow/files.xbow b/sys/arch/sgi/xbow/files.xbow
index 8a113c29c8d..29289cd5daa 100644
--- a/sys/arch/sgi/xbow/files.xbow
+++ b/sys/arch/sgi/xbow/files.xbow
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.xbow,v 1.2 2009/04/13 21:17:54 miod Exp $
+#	$OpenBSD: files.xbow,v 1.3 2009/05/08 23:08:35 miod Exp $
 
 # IP30 and IP27 planar XBow bus
 define	xbow {[vendor = -1], [product = -1]}
@@ -11,11 +11,6 @@ device	xheart {} : onewirebus
 attach	xheart at xbow
 file	arch/sgi/xbow/xheart.c			xheart
 
-# IP27 Hub
-device	xhub {}
-attach	xhub at xbow
-file	arch/sgi/xbow/xhub.c			xhub
-
 # PCI Bridge
 device	xbridge {} : pcibus
 attach	xbridge at xbow
diff --git a/sys/arch/sgi/xbow/xhub.c b/sys/arch/sgi/xbow/xhub.c
deleted file mode 100644
index c930ad69211..00000000000
--- a/sys/arch/sgi/xbow/xhub.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$OpenBSD: xhub.c,v 1.2 2008/07/28 18:50:59 miod Exp $	*/
-
-/*
- * Copyright (c) 2008 Miodrag Vallat.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * IP27 Hub Widget
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
-
-#include <machine/autoconf.h>
-#include <machine/cpu.h>
-
-#include <sgi/xbow/xbow.h>
-#include <sgi/xbow/xbowdevs.h>
-
-int	xhub_match(struct device *, void *, void *);
-void	xhub_attach(struct device *, struct device *, void *);
-
-struct cfattach xhub_ca = {
-	sizeof(struct device), xhub_match, xhub_attach,
-};
-
-struct cfdriver xhub_cd = {
-	NULL, "xhub", DV_DULL,
-};
-
-int
-xhub_match(struct device *parent, void *match, void *aux)
-{
-	struct xbow_attach_args *xaa = aux;
-
-	if (xaa->xaa_vendor == XBOW_VENDOR_SGI4 &&
-	    xaa->xaa_product == XBOW_PRODUCT_SGI4_HUB)
-		return xbow_intr_widget == 0 ? 20 : 1;
-
-	return 0;
-}
-
-void
-xhub_attach(struct device *parent, struct device *self, void *aux)
-{
-	struct xbow_attach_args *xaa = aux;
-
-	printf(" revision %d\n", xaa->xaa_revision);
-
-	/*
-	 * If no other widget has claimed interrupts routing, do it now.
-	 */
-	if (xbow_intr_widget == 0) {
-		xbow_intr_widget = xaa->xaa_widget;
-	}
-
-	/* initialize interrupt handling here */
-}