Enable Bluetooth (btd and btctl are not hooked into the build yet)

9 files changed, 96 insertions, 96 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 507db039841..c31c722df7b 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.204 2008/11/24 22:31:18 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.205 2008/11/26 21:54:20 uwe Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -132,21 +132,21 @@ uvideo* at uhub?
 video*  at uvideo?
 
 # Bluetooth controllers
-#ubt*	at uhub?			# USB Bluetooth
+ubt*	at uhub?			# USB Bluetooth
 
 # Bluetooth bus support
-#bthub*	at ubt?
+bthub*	at ubt?
 
 # Bluetooth HID support
-#bthidev* at bthub?
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
+bthidev* at bthub?
+btkbd*	at bthidev?
+btms*	at bthidev?
+wskbd*	at btkbd? mux 1
+wsmouse* at btms? mux 0
 
 # Bluetooth audio support
-#btsco*	at bthub?
-#audio*	at btsco?
+btsco*	at bthub?
+audio*	at btsco?
 
 # EV6 Tsunami Core Logic
 tsc*	at	mainbus0
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 71be525c762..8a6b9db132e 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.248 2008/11/24 22:31:18 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.249 2008/11/26 21:54:20 uwe Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -231,23 +231,23 @@ sdmmc*	at sdhc?		# SD/MMC bus
 scsibus* at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
-#sbt*	at sdmmc?		# SDIO Bluetooth
-#ubt*	at uhub?		# USB Bluetooth
+sbt*	at sdmmc?		# SDIO Bluetooth
+ubt*	at uhub?		# USB Bluetooth
 
 # Bluetooth bus support
-#bthub*	at sbt?
-#bthub*	at ubt?
+bthub*	at sbt?
+bthub*	at ubt?
 
 # Bluetooth HID support
-#bthidev* at bthub?
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
+bthidev* at bthub?
+btkbd*	at bthidev?
+btms*	at bthidev?
+wskbd*	at btkbd? mux 1
+wsmouse* at btms? mux 0
 
 # Bluetooth audio support
-#btsco*	at bthub?
-#audio*	at btsco?
+btsco*	at bthub?
+audio*	at btsco?
 
 isadma0	at isa?
 
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index af23fedbbe9..beebf46ff7e 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.22 2008/11/24 22:31:18 uwe Exp $ 
+# $OpenBSD: GENERIC,v 1.23 2008/11/26 21:54:20 uwe Exp $ 
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -155,21 +155,21 @@ uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
 onewire* at uow?
 
 # Bluetooth controllers
-#ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub?		# USB Bluetooth
 
 # Bluetooth bus support
-#bthub*	at ubt?
+bthub*	at ubt?
 
 # Bluetooth HID support
-#bthidev* at bthub?
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
+bthidev* at bthub?
+btkbd*	at bthidev?
+btms*	at bthidev?
+wskbd*	at btkbd? mux 1
+wsmouse* at btms? mux 0
 
 # Bluetooth audio support
-#btsco*	at bthub?
-#audio*	at btsco?
+btsco*	at bthub?
+audio*	at btsco?
 
 amphy*		at mii?		# AMD 79C873 PHYs
 dcphy*		at mii?		# Digital Clone PHYs
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 9befcababe2..a7498a8dbcf 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.121 2008/11/24 22:31:18 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.122 2008/11/26 21:54:20 uwe Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -172,21 +172,21 @@ uow*	at uhub?		# Maxim/Dallas DS2490 1-Wire adapter
 onewire* at uow?
 
 # Bluetooth controllers
-#ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub?		# USB Bluetooth
 
 # Bluetooth bus support
-#bthub*	at ubt?
+bthub*	at ubt?
 
 # Bluetooth HID support
-#bthidev* at bthub?
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
+bthidev* at bthub?
+btkbd*	at bthidev?
+btms*	at bthidev?
+wskbd*	at btkbd? mux 1
+wsmouse* at btms? mux 0
 
 # Bluetooth audio support
-#btsco*	at bthub?
-#audio*	at btsco?
+btsco*	at bthub?
+audio*	at btsco?
 
 sti0	at mainbus0 irq 11	# [H]CRX-{8,24,48}[Z] graphics
 sti0	at phantomas0 irq 11	# builtin graphics on BC*
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a7cec2a8d61..1dfd8ea7e75 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.641 2008/11/24 22:31:19 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.642 2008/11/26 21:54:20 uwe Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -294,23 +294,23 @@ sdmmc*	at sdhc?		# SD/MMC bus
 scsibus* at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
-#sbt*	at sdmmc?		# SDIO Bluetooth
-#ubt*	at uhub?		# USB Bluetooth
+sbt*	at sdmmc?		# SDIO Bluetooth
+ubt*	at uhub?		# USB Bluetooth
 
 # Bluetooth bus support
-#bthub*	at sbt?
-#bthub*	at ubt?
+bthub*	at sbt?
+bthub*	at ubt?
 
 # Bluetooth HID support
-#bthidev* at bthub?
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
+bthidev* at bthub?
+btkbd*	at bthidev?
+btms*	at bthidev?
+wskbd*	at btkbd? mux 1
+wsmouse* at btms? mux 0
 
 # Bluetooth audio support
-#btsco*	at bthub?
-#audio*	at btsco?
+btsco*	at bthub?
+audio*	at btsco?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index 57a626c3c77..6adcdbc28fe 100644
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.17 2008/11/24 22:31:19 uwe Exp $
+# $OpenBSD: GENERIC,v 1.18 2008/11/26 21:54:20 uwe Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -158,21 +158,21 @@ udcf*	at uhub?		# Gude Expert mouseCLOCK
 #onewire* at uow?
 
 # Bluetooth controllers
-#ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub?		# USB Bluetooth
 
 # Bluetooth bus support
-#bthub*	at ubt?
+bthub*	at ubt?
 
 # Bluetooth HID support
-#bthidev* at bthub?
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
+bthidev* at bthub?
+btkbd*	at bthidev?
+btms*	at bthidev?
+wskbd*	at btkbd? mux 1
+wsmouse* at btms? mux 0
 
 # Bluetooth audio support
-#btsco*	at bthub?
-#audio*	at btsco?
+btsco*	at bthub?
+audio*	at btsco?
 
 sd*	at scsibus?			# SCSI disk drives
 cd*	at scsibus?			# SCSI CD-ROM drives
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index fd18d7284e4..bacad622569 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.184 2008/11/24 22:31:19 uwe Exp $g
+#	$OpenBSD: GENERIC,v 1.185 2008/11/26 21:54:20 uwe Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -295,21 +295,21 @@ uvideo* at uhub?
 video*  at uvideo?
 
 # Bluetooth controllers
-#ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub?		# USB Bluetooth
 
 # Bluetooth bus support
-#bthub*	at ubt?
+bthub*	at ubt?
 
 # Bluetooth HID support
-#bthidev* at bthub?
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
+bthidev* at bthub?
+btkbd*	at bthidev?
+btms*	at bthidev?
+wskbd*	at btkbd? mux 1
+wsmouse* at btms? mux 0
 
 # Bluetooth audio support
-#btsco*	at bthub?
-#audio*	at btsco?
+btsco*	at bthub?
+audio*	at btsco?
 
 # I2C bus support
 iic*		at kiic?
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index d9fd5222a16..841f09b4226 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.223 2008/11/24 22:31:19 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.224 2008/11/26 21:54:20 uwe Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -247,21 +247,21 @@ uvideo* at uhub?
 video*  at uvideo?
 
 # Bluetooth controllers
-#ubt*	at uhub?		# USB Bluetooth
+ubt*	at uhub?		# USB Bluetooth
 
 # Bluetooth bus support
-#bthub*	at ubt?
+bthub*	at ubt?
 
 # Bluetooth HID support
-#bthidev* at bthub?
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
+bthidev* at bthub?
+btkbd*	at bthidev?
+btms*	at bthidev?
+wskbd*	at btkbd? mux 1
+wsmouse* at btms? mux 0
 
 # Bluetooth audio support
-#btsco*	at bthub?
-#audio*	at btsco?
+btsco*	at bthub?
+audio*	at btsco?
 
 # CardBus bus support
 cardbus* at cardslot?
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 3872d3b24f5..38337950aec 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.69 2008/11/24 22:31:19 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.70 2008/11/26 21:54:20 uwe Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -210,23 +210,23 @@ sdmmc*		at pxammc?		# SD/MMC bus
 scsibus*	at sdmmc?		# SCSI emulation
 
 # Bluetooth controllers
-#sbt*	at sdmmc?			# SDIO Bluetooth
-#ubt*	at uhub?			# USB Bluetooth
+sbt*	at sdmmc?			# SDIO Bluetooth
+ubt*	at uhub?			# USB Bluetooth
 
 # Bluetooth bus support
-#bthub*	at sbt?
-#bthub*	at ubt?
+bthub*	at sbt?
+bthub*	at ubt?
 
 # Bluetooth HID support
-#bthidev* at bthub?
-#btkbd*	at bthidev?
-#btms*	at bthidev?
-#wskbd*	at btkbd? mux 1
-#wsmouse* at btms? mux 0
+bthidev* at bthub?
+btkbd*	at bthidev?
+btms*	at bthidev?
+wskbd*	at btkbd? mux 1
+wsmouse* at btms? mux 0
 
 # Bluetooth audio support
-#btsco*	at bthub?
-#audio*	at btsco?
+btsco*	at bthub?
+audio*	at btsco?
 
 # 1-Wire devices
 option ONEWIREVERBOSE