Add missing bthub device entries on arches that support bluetooth.

ok miod@, deraadt@, todd@.

7 files changed, 36 insertions, 8 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 877e2cdc497..b415cde65f1 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.60 2009/08/13 15:04:20 dlg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.61 2010/03/30 19:16:09 matthieu Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -131,6 +131,7 @@ cdev_decl(nnpfs_dev);
 #include "pci.h"
 cdev_decl(pci);
 #endif
+#include "bthub.h"
 
 #include "systrace.h"
 #include "hotplug.h"
@@ -208,6 +209,7 @@ struct cdevsw	cdevsw[] =
 	cdev_radio_init(NRADIO,radio), /* 59: generic radio I/O */
 	cdev_mouse_init(NWSMUX, wsmux),	/* 60: ws multiplexor */
 	cdev_vscsi_init(NVSCSI, vscsi),	/* 61: vscsi */
+	cdev_bthub_init(NBTHUB, bthub), /* 62: bthub */
 };
 int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
 
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index c28e3fe6d69..1a4dd1773b7 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.23 2009/08/13 15:04:20 dlg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.24 2010/03/30 19:16:09 matthieu Exp $	*/
 /*	$NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $	*/
 
 /*
@@ -141,6 +141,11 @@ cdev_decl(pci);
 #include "uscanner.h"
 
 /*
+ * Bluetooth devices
+ */
+#include "bthub.h"
+
+/*
  * WSCONS devices
  */
 #include "wsdisplay.h"
@@ -404,6 +409,7 @@ struct cdevsw cdevsw[] = {
 	cdev_ptm_init(NPTY,ptm),		/* 98: pseudo-tty ptm device */
 	cdev_spkr_init(NSPKR,spkr),		/* 99: PC speaker */
 	cdev_vscsi_init(NVSCSI,vscsi),		/* 100: vscsi */
+	cdev_bthub_init(NBTHUB,bthub),		/* 101: bthub */
 };
 
 int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 7d0df892a08..9d5404bd81a 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.48 2009/08/13 15:10:26 dlg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.49 2010/03/30 19:16:09 matthieu Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -124,6 +124,8 @@ cdev_decl(pci);
 #include "ucom.h"
 #include "uscanner.h"
 
+#include "bthub.h"
+
 struct cdevsw   cdevsw[] =
 {
 	cdev_cn_init(1,cn),		/*  0: virtual console */
@@ -190,6 +192,7 @@ struct cdevsw   cdevsw[] =
 	cdev_lkm_dummy(),		/* 52: */
 	cdev_lkm_dummy(),		/* 53: */
 	cdev_vscsi_init(NVSCSI,vscsi),	/* 54: vscsi */
+	cdev_bthub_init(NBTHUB,bthub),	/* 55: bthub */
 };
 int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index 98fb35877d1..cc7c2fcd9f6 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.13 2009/08/13 15:04:20 dlg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.14 2010/03/30 19:16:09 matthieu Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -133,6 +133,11 @@ cdev_decl(pci);
 #include "uscanner.h"
 
 /*
+ * Bluetooth devices
+ */
+#include "bthub.h"
+
+/*
  * WSCONS devices
  */
 #include "wsdisplay.h"
@@ -382,6 +387,7 @@ struct cdevsw cdevsw[] = {
 	cdev_radio_init(NRADIO,radio),		/* 97: generic radio I/O */
 	cdev_ptm_init(NPTY,ptm),		/* 98: pseudo-tty ptm device */
 	cdev_vscsi_init(NVSCSI,vscsi),		/* 99: vscsi */
+	cdev_bthub_init(NBTHUB,bthub),		/* 100: bthub */
 };
 
 int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index 4fac5af5bfc..a5c0a544c6b 100644
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.3 2010/02/28 08:30:27 otto Exp $ */
+/*	$OpenBSD: conf.c,v 1.4 2010/03/30 19:16:09 matthieu Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -138,6 +138,8 @@ cdev_decl(pci);
 #include "urio.h"
 #include "ucom.h"
 
+#include "bthub.h"
+
 struct cdevsw	cdevsw[] =
 {
 	cdev_cn_init(1,cn),		/* 0: virtual console */
@@ -215,7 +217,8 @@ struct cdevsw	cdevsw[] =
 	cdev_ulpt_init(NULPT,ulpt),	/* 64: USB printers */
 	cdev_urio_init(NURIO,urio),	/* 65: USB Diamond Rio 500 */
 	cdev_tty_init(NUCOM,ucom),	/* 66: USB tty */
-	cdev_hotplug_init(NHOTPLUG,hotplug) /* 67: devices hotplugging */
+	cdev_hotplug_init(NHOTPLUG,hotplug), /* 67: devices hotplugging */
+	cdev_bthub_init(NBTHUB,bthub),	/* 68: bluetooth hub */
 };
 
 int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index 111543cd4a4..49804f3fb8f 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.7 2009/08/13 15:04:20 dlg Exp $ */
+/*	$OpenBSD: conf.c,v 1.8 2010/03/30 19:16:09 matthieu Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -112,6 +112,8 @@ cdev_decl(pci);
 
 #include "vscsi.h"
 
+#include "bthub.h"
+
 struct cdevsw cdevsw[] = {
 	cdev_cn_init(1,cn),		/* 0: virtual console */
 	cdev_ctty_init(1,ctty),		/* 1: controlling terminal */
@@ -198,6 +200,9 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),			/* 76 */
 	cdev_ptm_init(NPTY,ptm),	/* 77: pseudo-tty ptm device */
 	cdev_vscsi_init(NVSCSI,vscsi),	/* 78: vscsi */
+	cdev_notdef(),			/* 79 */
+	cdev_notdev(),			/* 80 */
+	cdev_bthub_init(NBTHUB,bthub),	/* 81: bluetooth hub */
 };
 int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
 
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 66dca24ace1..14d11a15563 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.53 2009/08/13 19:44:41 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.54 2010/03/30 19:16:09 matthieu Exp $	*/
 /*	$NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
 
 /*
@@ -106,6 +106,8 @@ cdev_decl(pci);
 #include "ucom.h"
 #include "uscanner.h"
 
+#include "bthub.h"
+
 #include "pf.h"
 
 #ifdef NNPFS
@@ -291,6 +293,7 @@ struct cdevsw	cdevsw[] =
 	cdev_tty_init(NSBBC,sbbc),	/* 126: SBBC console */
 	cdev_tty_init(NVCCTTY,vcctty),	/* 127: virtual console concentrator */
 	cdev_vscsi_init(NVSCSI,vscsi),	/* 128: vscsi */
+	cdev_bthub_init(NBTHUB,bthub),	/* 129: bluetooth hub */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);