Author: rpaulo
Date: Tue Apr 20 12:07:16 2010
New Revision: 206896
URL: http://svn.freebsd.org/changeset/base/206896
Log:
MFC r206427, r206706, r206771:
ubthidhci rc.d script to switch an USB bluetooth dongle from HID to
HCI mode.
Added:
stable/8/etc/rc.d/ubthidhci
- copied unchanged from r206427, head/etc/rc.d/ubthidhci
Modified:
stable/8/etc/defaults/rc.conf
stable/8/etc/rc.d/Makefile
stable/8/share/man/man5/rc.conf.5
Directory Properties:
stable/8/etc/ (props changed)
stable/8/share/man/man5/ (props changed)
Modified: stable/8/etc/defaults/rc.conf
==============================================================================
--- stable/8/etc/defaults/rc.conf Tue Apr 20 10:42:08 2010
(r206895)
+++ stable/8/etc/defaults/rc.conf Tue Apr 20 12:07:16 2010
(r206896)
@@ -433,6 +433,11 @@ rfcomm_pppd_server_two_channel="3" # Ove
#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register
#rfcomm_pppd_server_two_register_dun="NO" # for 'two'
+ubthidhci_enable="NO" # Switch an USB BT controller present on
+#ubthidhci_busnum="3" # bus 3 and addr 2 from HID mode to HCI mode.
+#ubthidhci_addr="2" # Check usbconfig list to find the correct
+ # numbers for your system.
+
### Miscellaneous network options: ###
icmp_bmcastecho="NO" # respond to broadcast ping packets
Modified: stable/8/etc/rc.d/Makefile
==============================================================================
--- stable/8/etc/rc.d/Makefile Tue Apr 20 10:42:08 2010 (r206895)
+++ stable/8/etc/rc.d/Makefile Tue Apr 20 12:07:16 2010 (r206896)
@@ -50,6 +50,10 @@ FILES+= sshd
FILES+= nscd
.endif
+.if ${MK_BLUETOOTH} != "no"
+FILES+= ubthidhci
+.endif
+
FILESDIR= /etc/rc.d
FILESMODE= ${BINMODE}
Copied: stable/8/etc/rc.d/ubthidhci (from r206427, head/etc/rc.d/ubthidhci)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/8/etc/rc.d/ubthidhci Tue Apr 20 12:07:16 2010 (r206896, copy
of r206427, head/etc/rc.d/ubthidhci)
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ubthidhci
+# REQUIRE: DAEMON
+# BEFORE: bluetooth
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="ubthidhci"
+command="/usr/sbin/usbconfig"
+rcvar=`set_rcvar`
+start_precmd="ubthidhci_prestart"
+
+ubthidhci_prestart()
+{
+
+ if [ -z ${ubthidhci_busnum} ]; then
+ warn ubthidhci_busnum is not set
+ return 1
+ fi
+ if [ -z ${ubthidhci_addr} ]; then
+ warn ubthidhci_addr is not set
+ return 1
+ fi
+}
+
+load_rc_config $name
+#
+# We discard the output because:
+# 1) we don't want it to show up during boot; and
+# 2) the request usually returns an error, but that doesn't mean it failed
+#
+# NB: 0x40 is UT_VENDOR
+command_args="-u ${ubthidhci_busnum} -a ${ubthidhci_addr} do_request 0x40 0 0
0 0 > /dev/null 2>&1"
+
+run_rc_command "$1"
Modified: stable/8/share/man/man5/rc.conf.5
==============================================================================
--- stable/8/share/man/man5/rc.conf.5 Tue Apr 20 10:42:08 2010
(r206895)
+++ stable/8/share/man/man5/rc.conf.5 Tue Apr 20 12:07:16 2010
(r206896)
@@ -4143,6 +4143,26 @@ if it should register Dial-Up Networking
RFCOMM channel.
Default
.Dq Li NO .
+.It Va ubthidhci_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+change the USB Bluetooth controller from HID mode to HCI mode.
+You also need to specify the location of USB Bluetooth controller with the
+.Va ubthidhci_busnum
+and
+.Va ubthidhci_addr
+variables.
+.It Va ubthidhci_busnum
+Bus number where the USB Bluetooth controller is located.
+Check the output of
+.Xr usbconfig 1
+on your system to find this information.
+.It Va ubthidhci_addr
+Bus address of the USB Bluetooth controller.
+Check the output of
+.Xr usbconfig 1
+on your system to find this information.
.El
.Sh FILES
.Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact
@@ -4158,6 +4178,7 @@ Default
.Xr kbdcontrol 1 ,
.Xr makewhatis 1 ,
.Xr sh 1 ,
+.Xr usbconfig 1 ,
.Xr vi 1 ,
.Xr vidcontrol 1 ,
.Xr bridge 4 ,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
