rename btcontrol(8) as btdevctl(8) to make it fit with the NetBSD naming
scheme for control programs. This fixes pr 34051.
This commit is contained in:
plunky
parent
cff0bb36bb
commit
885b13c515
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.643 2006/07/27 22:18:46 christos Exp $
|
||||
# $NetBSD: mi,v 1.644 2006/08/13 09:03:21 plunky Exp $
|
||||
. base-sys-root
|
||||
./altroot base-sys-root
|
||||
./bin base-sys-root
|
||||
|
|
@ -989,7 +989,8 @@
|
|||
./usr/sbin/bootptest base-bootserver-bin
|
||||
./usr/sbin/bpm base-pkgutil-bin
|
||||
./usr/sbin/btconfig base-sysutil-bin
|
||||
./usr/sbin/btcontrol base-sysutil-bin
|
||||
./usr/sbin/btcontrol base-obsolete obsolete
|
||||
./usr/sbin/btdevctl base-sysutil-bin
|
||||
./usr/sbin/bthcid base-sysutil-bin
|
||||
./usr/sbin/catman base-man-bin
|
||||
./usr/sbin/chat base-ppp-bin
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.909 2006/08/12 23:54:12 christos Exp $
|
||||
# $NetBSD: mi,v 1.910 2006/08/13 09:03:21 plunky Exp $
|
||||
./etc/mtree/set.comp comp-sys-root
|
||||
./usr/bin/addr2line comp-debug-bin bfd
|
||||
./usr/bin/ar comp-util-bin bfd
|
||||
|
|
@ -2745,7 +2745,8 @@
|
|||
./usr/libdata/debug/usr/sbin/bootpgw.debug comp-bootserver-debug debug
|
||||
./usr/libdata/debug/usr/sbin/bootptest.debug comp-bootserver-debug debug
|
||||
./usr/libdata/debug/usr/sbin/btconfig.debug comp-sysutil-debug debug
|
||||
./usr/libdata/debug/usr/sbin/btcontrol.debug comp-sysutil-debug debug
|
||||
./usr/libdata/debug/usr/sbin/btcontrol.debug comp-obsolete obsolete
|
||||
./usr/libdata/debug/usr/sbin/btdevctl.debug comp-sysutil-debug debug
|
||||
./usr/libdata/debug/usr/sbin/bthcid.debug comp-sysutil-debug debug
|
||||
./usr/libdata/debug/usr/sbin/catman.debug comp-man-debug debug
|
||||
./usr/libdata/debug/usr/sbin/chat.debug comp-ppp-debug debug
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.173 2006/07/26 11:14:55 tron Exp $
|
||||
# $NetBSD: mi,v 1.174 2006/08/13 09:03:22 plunky Exp $
|
||||
#
|
||||
# Note: end-user configuration files that are moved to another location
|
||||
# should not be marked "obsolete"; they should just be removed from
|
||||
|
|
@ -148,7 +148,8 @@
|
|||
./etc/rc.d/bootconf.sh etc-sys-rc
|
||||
./etc/rc.d/bootparams etc-bootserver-rc
|
||||
./etc/rc.d/btconfig etc-sys-rc
|
||||
./etc/rc.d/btcontrol etc-sys-rc
|
||||
./etc/rc.d/btcontrol etc-obsolete obsolete
|
||||
./etc/rc.d/btdevctl etc-sys-rc
|
||||
./etc/rc.d/bthcid etc-sys-rc
|
||||
./etc/rc.d/ccd etc-sys-rc
|
||||
./etc/rc.d/cgd etc-sys-rc
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.918 2006/08/13 02:21:45 simonb Exp $
|
||||
# $NetBSD: mi,v 1.919 2006/08/13 09:03:22 plunky Exp $
|
||||
./etc/mtree/set.man man-sys-root
|
||||
./usr/share/info/am-utils.info man-amd-info info
|
||||
./usr/share/info/as.info man-computil-info bfd,info
|
||||
|
|
@ -1761,7 +1761,8 @@
|
|||
./usr/share/man/cat8/bounce.0 man-postfix-catman postfix,.cat
|
||||
./usr/share/man/cat8/brconfig.0 man-netutil-catman .cat
|
||||
./usr/share/man/cat8/btconfig.0 man-sysutil-catman .cat
|
||||
./usr/share/man/cat8/btcontrol.0 man-sysutil-catman .cat
|
||||
./usr/share/man/cat8/btcontrol.0 man-obsolete obsolete
|
||||
./usr/share/man/cat8/btdevctl.0 man-sysutil-catman .cat
|
||||
./usr/share/man/cat8/bthcid.0 man-sysutil-catman .cat
|
||||
./usr/share/man/cat8/catman.0 man-man-catman .cat
|
||||
./usr/share/man/cat8/cats/MAKEDEV.0 man-obsolete obsolete
|
||||
|
|
@ -4126,7 +4127,8 @@
|
|||
./usr/share/man/man8/bounce.8 man-postfix-man postfix,.man
|
||||
./usr/share/man/man8/brconfig.8 man-netutil-man .man
|
||||
./usr/share/man/man8/btconfig.8 man-sysutil-man .man
|
||||
./usr/share/man/man8/btcontrol.8 man-sysutil-man .man
|
||||
./usr/share/man/man8/btcontrol.8 man-obsolete obsolete
|
||||
./usr/share/man/man8/btdevctl.8 man-sysutil-man .man
|
||||
./usr/share/man/man8/bthcid.8 man-sysutil-man .man
|
||||
./usr/share/man/man8/catman.8 man-man-man .man
|
||||
./usr/share/man/man8/cats/MAKEDEV.8 man-obsolete obsolete
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: rc.conf,v 1.79 2006/07/26 11:14:55 tron Exp $
|
||||
# $NetBSD: rc.conf,v 1.80 2006/08/13 09:03:23 plunky Exp $
|
||||
#
|
||||
# /etc/defaults/rc.conf --
|
||||
# default configuration of /etc/rc.conf
|
||||
|
|
@ -269,7 +269,7 @@ isdnd=NO isdnd_flags=""
|
|||
|
||||
# Bluetooth daemons
|
||||
btconfig=NO # Bluetooth controller configuration
|
||||
btcontrol=NO # Bluetooth device configuration
|
||||
btdevctl=NO # Bluetooth device configuration
|
||||
bthcid=NO bthcid_flags="" # Bluetooth HCI daemon
|
||||
sdpd=NO # Service Discovery daemon
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: special,v 1.99 2006/07/26 11:14:55 tron Exp $
|
||||
# $NetBSD: special,v 1.100 2006/08/13 09:03:23 plunky Exp $
|
||||
# @(#)special 8.2 (Berkeley) 1/23/94
|
||||
#
|
||||
# Hand-crafted mtree specification for the dangerous files.
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
./etc/rc.d/bootconf.sh type=file mode=0555
|
||||
./etc/rc.d/bootparams type=file mode=0555
|
||||
./etc/rc.d/btconfig type=file mode=0555
|
||||
./etc/rc.d/btcontrol type=file mode=0555
|
||||
./etc/rc.d/btdevctl type=file mode=0555
|
||||
./etc/rc.d/bthcid type=file mode=0555
|
||||
./etc/rc.d/ccd type=file mode=0555
|
||||
./etc/rc.d/cleartmp type=file mode=0555
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.60 2006/08/07 02:08:47 dyoung Exp $
|
||||
# $NetBSD: Makefile,v 1.61 2006/08/13 09:03:23 plunky Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
CONFIGFILES=\
|
||||
DAEMON LOGIN NETWORKING SERVERS \
|
||||
accounting altqd amd apmd \
|
||||
bootconf.sh bootparams btconfig btcontrol bthcid \
|
||||
bootconf.sh bootparams btconfig btdevctl bthcid \
|
||||
ccd cgd cleartmp cron \
|
||||
dhclient dhcpd dhcrelay dmesg downinterfaces \
|
||||
fixsb fsck ftpd \
|
||||
|
|
|
|||
|
|
@ -1,40 +1,40 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# $NetBSD: btcontrol,v 1.1 2006/07/26 11:14:55 tron Exp $
|
||||
# $NetBSD: btdevctl,v 1.1 2006/08/13 09:03:23 plunky Exp $
|
||||
#
|
||||
|
||||
# PROVIDE: btcontrol
|
||||
# PROVIDE: btdevctl
|
||||
# REQUIRE: bluetooth
|
||||
# BEFORE: LOGIN
|
||||
|
||||
$_rc_subr_loaded . /etc/rc.subr
|
||||
|
||||
name="btcontrol"
|
||||
name="btdevctl"
|
||||
rcvar=${name}
|
||||
command="/usr/sbin/${name}"
|
||||
start_cmd="btcontrol_start"
|
||||
stop_cmd="btcontrol_stop"
|
||||
start_cmd="btdevctl_start"
|
||||
stop_cmd="btdevctl_stop"
|
||||
|
||||
btcontrol_start()
|
||||
btdevctl_start()
|
||||
{
|
||||
echo 'Attaching Bluetooth devices:'
|
||||
|
||||
#
|
||||
# If ${btcontrol_devices} is set, it should be a list of devices to
|
||||
# If ${btdevctl_devices} is set, it should be a list of devices to
|
||||
# attach. Otherwise, all available devices will be attached.
|
||||
#
|
||||
|
||||
devs="${btcontrol_devices:-$(cd /dev/ && echo btdev*)}"
|
||||
devs="${btdev_devices:-$(cd /dev/ && echo btdev*)}"
|
||||
for dev in ${devs}; do
|
||||
${command} ${dev} attach -q
|
||||
done
|
||||
}
|
||||
|
||||
btcontrol_stop()
|
||||
btdevctl_stop()
|
||||
{
|
||||
echo 'Detach Bluetooth devices:'
|
||||
|
||||
devs="${btcontrol_devices:-$(cd /dev/ && echo btdev*)}"
|
||||
devs="${btdevctl_devices:-$(cd /dev/ && echo btdev*)}"
|
||||
for dev in ${devs}; do
|
||||
${command} ${dev} detach -q
|
||||
done
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: btdev.4,v 1.2 2006/07/29 23:57:03 wiz Exp $
|
||||
.\" $NetBSD: btdev.4,v 1.3 2006/08/13 09:03:23 plunky Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2006 Itronix Inc.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
.\" POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd July 26, 2006
|
||||
.Dd August 12, 2006
|
||||
.Dt BTDEV 4
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -47,7 +47,7 @@ pseudo-device is used to attach remote Bluetooth devices to the system. If
|
|||
no count is specified, the default value of 4 will be used.
|
||||
.Sh CONFIGURATION
|
||||
Normally, Bluetooth Remote Devices will be configured using the
|
||||
.Xr btcontrol 8
|
||||
.Xr btdevctl 8
|
||||
program, which passes a
|
||||
.Xr proplib 3
|
||||
dictionary to the appropriate control file
|
||||
|
|
@ -99,7 +99,7 @@ Detach Bluetooth Device. Currently no properties are used.
|
|||
.Xr bluetooth 4 ,
|
||||
.Xr bthidev 4 ,
|
||||
.Xr btsco 4 ,
|
||||
.Xr btcontrol 8
|
||||
.Xr btdevctl 8
|
||||
.Sh HISTORY
|
||||
The
|
||||
.Nm
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: bthidev.4,v 1.3 2006/07/30 00:01:24 wiz Exp $
|
||||
.\" $NetBSD: bthidev.4,v 1.4 2006/08/13 09:03:23 plunky Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2006 Itronix Inc.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
.\" POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd July 26, 2006
|
||||
.Dd August 12, 2006
|
||||
.Dt BTHIDEV 4
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -54,7 +54,7 @@ driver may have several children attached that handle particular
|
|||
components and dispatches data to them based on the report id.
|
||||
.Pp
|
||||
Normally, Bluetooth HIDs will be attached using the
|
||||
.Xr btcontrol 8
|
||||
.Xr btdevctl 8
|
||||
program.
|
||||
The following properties are used by the
|
||||
.Nm
|
||||
|
|
@ -99,7 +99,7 @@ the device to initiate the connection.
|
|||
.Xr btdev 4 ,
|
||||
.Xr btkbd 4 ,
|
||||
.Xr btms 4 ,
|
||||
.Xr btcontrol 8
|
||||
.Xr btdevctl 8
|
||||
.Sh HISTORY
|
||||
The
|
||||
.Nm
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: btkbd.4,v 1.1 2006/06/19 15:44:36 gdamore Exp $
|
||||
.\" $NetBSD: btkbd.4,v 1.2 2006/08/13 09:03:23 plunky Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2006 Itronix Inc.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
.\" POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.\"
|
||||
.Dd March 17, 2006
|
||||
.Dd August 12, 2006
|
||||
.Dt BTKBD 4
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -48,13 +48,13 @@ The
|
|||
driver provides support for Bluetooth wireless keyboards.
|
||||
.Pp
|
||||
Bluetooth keyboards are configured using the
|
||||
.Xr btcontrol 8
|
||||
.Xr btdevctl 8
|
||||
program, and provide system access through the
|
||||
.Xr wscons 4
|
||||
driver.
|
||||
.Sh SEE ALSO
|
||||
.Xr bluetooth 4 ,
|
||||
.Xr btcontrol 8 ,
|
||||
.Xr btdevctl 8 ,
|
||||
.Xr bthidev 4 ,
|
||||
.Xr wskbd 4
|
||||
.Sh HISTORY
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: btms.4,v 1.1 2006/06/19 15:44:36 gdamore Exp $
|
||||
.\" $NetBSD: btms.4,v 1.2 2006/08/13 09:03:23 plunky Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2006 Itronix Inc.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
.\" POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd March 17, 2006
|
||||
.Dd August 12, 2006
|
||||
.Dt BTMS 4
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -44,13 +44,13 @@ The
|
|||
driver provides support for Bluetooth wireless mice.
|
||||
.Pp
|
||||
Bluetooth mice must be configured with the
|
||||
.Xr btcontrol 8
|
||||
.Xr btdevctl 8
|
||||
program and provide system access through the
|
||||
.Xr wscons 4
|
||||
driver.
|
||||
.Sh SEE ALSO
|
||||
.Xr bluetooth 4 ,
|
||||
.Xr btcontrol 8 ,
|
||||
.Xr btdevctl 8 ,
|
||||
.Xr bthidev 4 ,
|
||||
.Xr wsmouse 4
|
||||
.Sh HISTORY
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: btsco.4,v 1.2 2006/07/30 00:06:17 wiz Exp $
|
||||
.\" $NetBSD: btsco.4,v 1.3 2006/08/13 09:03:23 plunky Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2006 Itronix Inc.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
.\" POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd July 26, 2006
|
||||
.Dd August 12, 2006
|
||||
.Dt BTSCO 4
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -49,7 +49,7 @@ driver, and only supports playing and recording of 8kHz, 16-bit,
|
|||
The
|
||||
.Nm
|
||||
driver must be configured at run time with the
|
||||
.Xr btcontrol 8
|
||||
.Xr btdevctl 8
|
||||
program.
|
||||
The following properties are used by the
|
||||
.Nm
|
||||
|
|
@ -125,7 +125,7 @@ will block until the remote device initiates the connection.
|
|||
.Xr audio 4 ,
|
||||
.Xr bluetooth 4 ,
|
||||
.Xr btdev 4 ,
|
||||
.Xr btcontrol 8
|
||||
.Xr btdevctl 8
|
||||
.Sh HISTORY
|
||||
The
|
||||
.Nm
|
||||
|
|
@ -160,7 +160,7 @@ My USB dongle says the maximum SCO payload is 64 bytes, so I am
|
|||
using an MTU of 48 bytes (17 * 3 - 3 = 48).
|
||||
.Pp
|
||||
Specify the MTU when you configure the SCO audio device with
|
||||
.Xr btcontrol 8
|
||||
.Xr btdevctl 8
|
||||
and all should be well.
|
||||
.Pp
|
||||
The failure mode is that the USB Bluetooth dongle locks
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: rc.conf.5,v 1.104 2006/07/30 00:18:09 wiz Exp $
|
||||
.\" $NetBSD: rc.conf.5,v 1.105 2006/08/13 09:03:23 plunky Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1996 Matthew R. Green
|
||||
.\" Copyright (c) 1997 Curt J. Sampson
|
||||
|
|
@ -1219,15 +1219,15 @@ boot time.
|
|||
.It Sy btconfig_args
|
||||
An optional string, containing default arguments for bluetooth devices to
|
||||
be configured.
|
||||
.It Sy btcontrol
|
||||
.It Sy btdevctl
|
||||
.Sq YES
|
||||
or
|
||||
.Sq NO .
|
||||
Attach Bluetooth devices.
|
||||
If the
|
||||
.Sy btcontrol_devices
|
||||
.Sy btdevctl_devices
|
||||
variable below is not specified, all devices known will be configured.
|
||||
.It Sy btcontrol_devices
|
||||
.It Sy btdevctl_devices
|
||||
An optional space separated list of
|
||||
.Xr btdev 4
|
||||
devices to be attached.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.216 2006/07/27 22:15:07 christos Exp $
|
||||
# $NetBSD: Makefile,v 1.217 2006/08/13 09:03:23 plunky Exp $
|
||||
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
SUBDIR= ac accton altq amd apm apmd arp bad144 bind bootp \
|
||||
btconfig btcontrol bthcid catman \
|
||||
btconfig btdevctl bthcid catman \
|
||||
chown chroot chrtbl cnwctl cron dev_mkdb \
|
||||
dhcp diskpart dumpfs dumplfs edquota eeprom \
|
||||
envstat eshconfig etcupdate extattrctl fssconfig fwctl gpioctl \
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
# $NetBSD: Makefile,v 1.2 2006/07/26 10:31:00 tron Exp $
|
||||
|
||||
PROG= btcontrol
|
||||
MAN= btcontrol.8
|
||||
SRCS= btcontrol.c cfg.c dev.c hid.c
|
||||
|
||||
DPADD+= ${LIBBLUETOOTH} ${LIBPROP} ${LIBSDP} ${LIBUSBHID}
|
||||
LDADD+= -lbluetooth -lprop -lsdp -lusbhid
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.1 2006/08/13 09:03:23 plunky Exp $
|
||||
|
||||
PROG= btdevctl
|
||||
MAN= btdevctl.8
|
||||
SRCS= btdevctl.c cfg.c dev.c hid.c
|
||||
|
||||
DPADD+= ${LIBBLUETOOTH} ${LIBPROP} ${LIBSDP} ${LIBUSBHID}
|
||||
LDADD+= -lbluetooth -lprop -lsdp -lusbhid
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: btcontrol.8,v 1.3 2006/07/29 23:55:28 wiz Exp $
|
||||
.\" $NetBSD: btdevctl.8,v 1.1 2006/08/13 09:03:23 plunky Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2006 Itronix Inc.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -51,14 +51,14 @@
|
|||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $Id: btcontrol.8,v 1.3 2006/07/29 23:55:28 wiz Exp $
|
||||
.\" $Id: btdevctl.8,v 1.1 2006/08/13 09:03:23 plunky Exp $
|
||||
.\" $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8,v 1.3 2005/01/18 20:02:30 ru Exp $
|
||||
.\"
|
||||
.Dd July 26, 2006
|
||||
.Dt BTCONTROL 8
|
||||
.Dd August 12, 2006
|
||||
.Dt BTDEVCTL 8
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm btcontrol
|
||||
.Nm btdevctl
|
||||
.Nd Bluetooth remote device control utility
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: btcontrol.c,v 1.2 2006/07/26 10:31:00 tron Exp $ */
|
||||
/* $NetBSD: btdevctl.c,v 1.1 2006/08/13 09:03:23 plunky Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Itronix Inc.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
#include <sys/cdefs.h>
|
||||
__COPYRIGHT("@(#) Copyright (c) 2006 Itronix, Inc.\n"
|
||||
"All rights reserved.\n");
|
||||
__RCSID("$NetBSD: btcontrol.c,v 1.2 2006/07/26 10:31:00 tron Exp $");
|
||||
__RCSID("$NetBSD: btdevctl.c,v 1.1 2006/08/13 09:03:23 plunky Exp $");
|
||||
|
||||
#include <prop/proplib.h>
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ __RCSID("$NetBSD: btcontrol.c,v 1.2 2006/07/26 10:31:00 tron Exp $");
|
|||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "btcontrol.h"
|
||||
#include "btdevctl.h"
|
||||
|
||||
const char *config_file = "/var/db/btdev.xml";
|
||||
const char *control_file = NULL;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: btcontrol.h,v 1.2 2006/07/26 10:31:00 tron Exp $ */
|
||||
/* $NetBSD: btdevctl.h,v 1.1 2006/08/13 09:03:23 plunky Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Itronix Inc.
|
||||
|
|
@ -31,8 +31,8 @@
|
|||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef __BTCONTROL_H__
|
||||
#define __BTCONTROL_H__
|
||||
#ifndef __BTDEVCTL_H__
|
||||
#define __BTDEVCTL_H__
|
||||
|
||||
extern const char *control_file;
|
||||
extern const char *config_file;
|
||||
|
|
@ -47,4 +47,4 @@ int hid_parse(int, char **);
|
|||
prop_dictionary_t read_config(void);
|
||||
int write_config(prop_dictionary_t);
|
||||
|
||||
#endif /* __BTCONTROL_H__ */
|
||||
#endif /* __BTDEVCTL_H__ */
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cfg.c,v 1.2 2006/07/26 10:31:00 tron Exp $ */
|
||||
/* $NetBSD: cfg.c,v 1.1 2006/08/13 09:03:23 plunky Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Itronix Inc.
|
||||
|
|
@ -53,12 +53,12 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: cfg.c,v 1.2 2006/07/26 10:31:00 tron Exp $
|
||||
* $Id: cfg.c,v 1.1 2006/08/13 09:03:23 plunky Exp $
|
||||
* $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/sdp.c,v 1.2 2006/02/10 19:54:17 markus Exp $
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__RCSID("$NetBSD: cfg.c,v 1.2 2006/07/26 10:31:00 tron Exp $");
|
||||
__RCSID("$NetBSD: cfg.c,v 1.1 2006/08/13 09:03:23 plunky Exp $");
|
||||
|
||||
#include <dev/bluetooth/btdev.h>
|
||||
#include <dev/usb/usb.h>
|
||||
|
|
@ -75,7 +75,7 @@ __RCSID("$NetBSD: cfg.c,v 1.2 2006/07/26 10:31:00 tron Exp $");
|
|||
#include <unistd.h>
|
||||
#include <usbhid.h>
|
||||
|
||||
#include "btcontrol.h"
|
||||
#include "btdevctl.h"
|
||||
|
||||
static int32_t parse_l2cap_psm(sdp_attr_t *);
|
||||
static int32_t parse_rfcomm_channel(sdp_attr_t *);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dev.c,v 1.2 2006/07/26 10:31:00 tron Exp $ */
|
||||
/* $NetBSD: dev.c,v 1.1 2006/08/13 09:03:23 plunky Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Itronix Inc.
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__RCSID("$NetBSD: dev.c,v 1.2 2006/07/26 10:31:00 tron Exp $");
|
||||
__RCSID("$NetBSD: dev.c,v 1.1 2006/08/13 09:03:23 plunky Exp $");
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/param.h>
|
||||
|
|
@ -44,7 +44,7 @@ __RCSID("$NetBSD: dev.c,v 1.2 2006/07/26 10:31:00 tron Exp $");
|
|||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "btcontrol.h"
|
||||
#include "btdevctl.h"
|
||||
|
||||
int
|
||||
dev_attach(int ac, char **av)
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: hid.c,v 1.2 2006/07/26 10:31:00 tron Exp $ */
|
||||
/* $NetBSD: hid.c,v 1.1 2006/08/13 09:03:23 plunky Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Itronix Inc.
|
||||
|
|
@ -55,12 +55,12 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: hid.c,v 1.2 2006/07/26 10:31:00 tron Exp $
|
||||
* $Id: hid.c,v 1.1 2006/08/13 09:03:23 plunky Exp $
|
||||
* $FreeBSD: src/usr.sbin/bluetooth/bthidcontrol/hid.c,v 1.1 2004/04/10 00:18:00 emax Exp $
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__RCSID("$NetBSD: hid.c,v 1.2 2006/07/26 10:31:00 tron Exp $");
|
||||
__RCSID("$NetBSD: hid.c,v 1.1 2006/08/13 09:03:23 plunky Exp $");
|
||||
|
||||
#include <dev/usb/usb.h>
|
||||
#include <dev/usb/usbhid.h>
|
||||
|
|
@ -71,7 +71,7 @@ __RCSID("$NetBSD: hid.c,v 1.2 2006/07/26 10:31:00 tron Exp $");
|
|||
#include <stdlib.h>
|
||||
#include <usbhid.h>
|
||||
|
||||
#include "btcontrol.h"
|
||||
#include "btdevctl.h"
|
||||
|
||||
static void hid_dump_item (char const *, struct hid_item *);
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# $NetBSD: postinstall,v 1.22 2006/07/26 11:14:55 tron Exp $
|
||||
# $NetBSD: postinstall,v 1.23 2006/08/13 09:03:23 plunky Exp $
|
||||
#
|
||||
# Copyright (c) 2002-2005 The NetBSD Foundation, Inc.
|
||||
# All rights reserved.
|
||||
|
|
@ -737,7 +737,7 @@ do_rc()
|
|||
compare_dir ${op} ${SRC_DIR}/etc/rc.d ${DEST_DIR}/etc/rc.d 555 \
|
||||
DAEMON LOGIN NETWORKING SERVERS \
|
||||
accounting altqd amd apmd \
|
||||
bootconf.sh bootparams btconfig btcontrol bthcid \
|
||||
bootconf.sh bootparams btconfig btdevctl bthcid \
|
||||
ccd cgd cleartmp cron \
|
||||
dhclient dhcpd dhcrelay dmesg downinterfaces \
|
||||
fixsb fsck ftpd \
|
||||
|
|
@ -762,7 +762,7 @@ do_rc()
|
|||
failed=$(( ${failed} + $? ))
|
||||
|
||||
# check for obsolete rc.d files
|
||||
for f in NETWORK fsck.sh kerberos nfsiod servers systemfs \
|
||||
for f in NETWORK btcontrol fsck.sh kerberos nfsiod servers systemfs \
|
||||
daemon gated login portmap sunndd xntpd; do
|
||||
fd=/etc/rc.d/${f}
|
||||
[ -e "${DEST_DIR}${fd}" ] && echo "${fd}"
|
||||
|
|
@ -771,6 +771,7 @@ do_rc()
|
|||
|
||||
# check for obsolete rc.conf(5) variables
|
||||
set -- amd amd_master \
|
||||
btcontrol btcontrol_devices \
|
||||
critical_filesystems critical_filesystems_beforenet \
|
||||
defcorename \
|
||||
ip6forwarding \
|
||||
|
|
|
|||
Loading…
Reference in New Issue