head	1.3;
access;
symbols
	RELENG_8_4:1.3.0.2
	RELENG_9_1_0_RELEASE:1.2.16.1.4.2
	RELENG_9_1:1.2.16.1.0.4
	RELENG_9_1_BP:1.2.16.1
	RELENG_8_3_0_RELEASE:1.2.10.1.8.1
	RELENG_8_3:1.2.10.1.0.8
	RELENG_8_3_BP:1.2.10.1
	RELENG_9_0_0_RELEASE:1.2.16.1.2.1
	RELENG_9_0:1.2.16.1.0.2
	RELENG_9_0_BP:1.2.16.1
	RELENG_9:1.2.0.16
	RELENG_9_BP:1.2
	RELENG_7_4_0_RELEASE:1.2.14.1
	RELENG_8_2_0_RELEASE:1.2.10.1.6.1
	RELENG_7_4:1.2.0.14
	RELENG_7_4_BP:1.2
	RELENG_8_2:1.2.10.1.0.6
	RELENG_8_2_BP:1.2.10.1
	RELENG_8_1_0_RELEASE:1.2.10.1.4.1
	RELENG_8_1:1.2.10.1.0.4
	RELENG_8_1_BP:1.2.10.1
	RELENG_7_3_0_RELEASE:1.2.12.1
	RELENG_7_3:1.2.0.12
	RELENG_7_3_BP:1.2
	RELENG_8_0_0_RELEASE:1.2.10.1.2.1
	RELENG_8_0:1.2.10.1.0.2
	RELENG_8_0_BP:1.2.10.1
	RELENG_8:1.2.0.10
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.2.8.1
	RELENG_7_2:1.2.0.8
	RELENG_7_2_BP:1.2
	RELENG_7_1_0_RELEASE:1.2.6.1
	RELENG_6_4_0_RELEASE:1.1.10.1.8.1
	RELENG_7_1:1.2.0.6
	RELENG_7_1_BP:1.2
	RELENG_6_4:1.1.10.1.0.8
	RELENG_6_4_BP:1.1.10.1
	RELENG_7_0_0_RELEASE:1.2
	RELENG_6_3_0_RELEASE:1.1.10.1
	RELENG_7_0:1.2.0.4
	RELENG_7_0_BP:1.2
	RELENG_6_3:1.1.10.1.0.6
	RELENG_6_3_BP:1.1.10.1
	RELENG_7:1.2.0.2
	RELENG_7_BP:1.2
	RELENG_6_2_0_RELEASE:1.1.10.1
	RELENG_6_2:1.1.10.1.0.4
	RELENG_6_2_BP:1.1.10.1
	RELENG_5_5_0_RELEASE:1.1.4.1
	RELENG_5_5:1.1.4.1.0.2
	RELENG_5_5_BP:1.1.4.1
	RELENG_6_1_0_RELEASE:1.1.10.1
	RELENG_6_1:1.1.10.1.0.2
	RELENG_6_1_BP:1.1.10.1
	RELENG_6_0_0_RELEASE:1.1
	RELENG_6_0:1.1.0.12
	RELENG_6_0_BP:1.1
	RELENG_6:1.1.0.10
	RELENG_6_BP:1.1
	RELENG_5_4_0_RELEASE:1.1
	RELENG_5_4:1.1.0.8
	RELENG_5_4_BP:1.1
	RELENG_5_3_0_RELEASE:1.1
	RELENG_5_3:1.1.0.6
	RELENG_5_3_BP:1.1
	RELENG_5:1.1.0.4
	RELENG_5_BP:1.1
	RELENG_5_2_1_RELEASE:1.1
	RELENG_5_2_0_RELEASE:1.1
	RELENG_5_2:1.1.0.2
	RELENG_5_2_BP:1.1;
locks; strict;
comment	@# @;


1.3
date	2012.11.17.01.49.02;	author svnexp;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2005.11.10.19.09.22;	author emax;	state Exp;
branches
	1.2.2.1
	1.2.6.1
	1.2.8.1
	1.2.10.1
	1.2.12.1
	1.2.14.1
	1.2.16.1;
next	1.1;

1.1
date	2003.10.12.22.04.18;	author emax;	state Exp;
branches
	1.1.4.1
	1.1.10.1;
next	;

1.3.2.1
date	2012.11.17.01.49.02;	author svnexp;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2013.03.28.13.02.42;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2012.11.17.08.01.16;	author svnexp;	state Exp;
branches;
next	;

1.2.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.2.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.2.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.10.1.2.1
	1.2.10.1.4.1
	1.2.10.1.6.1
	1.2.10.1.8.1;
next	1.2.10.2;

1.2.10.2
date	2012.11.17.10.35.56;	author svnexp;	state Exp;
branches;
next	;

1.2.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.2.10.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.2.10.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.10.1.8.2;

1.2.10.1.8.2
date	2012.11.17.08.24.37;	author svnexp;	state Exp;
branches;
next	;

1.2.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.2.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.2.14.2;

1.2.14.2
date	2012.11.17.08.16.37;	author svnexp;	state Exp;
branches;
next	;

1.2.16.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.2.16.1.2.1
	1.2.16.1.4.1;
next	1.2.16.2;

1.2.16.2
date	2012.11.17.11.36.11;	author svnexp;	state Exp;
branches;
next	;

1.2.16.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.2.16.1.2.2;

1.2.16.1.2.2
date	2012.11.17.08.36.11;	author svnexp;	state Exp;
branches;
next	;

1.2.16.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.16.1.4.2;

1.2.16.1.4.2
date	2012.11.17.08.47.00;	author svnexp;	state Exp;
branches;
next	;

1.1.4.1
date	2005.11.23.22.51.01;	author emax;	state Exp;
branches;
next	;

1.1.10.1
date	2005.11.23.18.03.32;	author emax;	state Exp;
branches
	1.1.10.1.8.1;
next	1.1.10.2;

1.1.10.2
date	2012.11.17.07.39.03;	author svnexp;	state Exp;
branches;
next	;

1.1.10.1.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Switching exporter and resync
@
text
@# $Id: protocols,v 1.2 2003/05/21 22:17:14 max Exp $
# $FreeBSD: head/etc/bluetooth/protocols 152286 2005-11-10 19:09:22Z emax $
#
# Bluetooth Protocol/Service Multiplexor (PSM) names and numbers
#
# See also
# https://www.bluetooth.org/foundry/assignnumb/document/assigned_numbers
#
# Protocol       PSM Alias         Reference

sdp              1   SDP           # Service Discovery Protocol
rfcomm           3   RFCOMM        # RFCOMM with TS 07.10
tcs-bin          5   TCS-BIN       # Telephony Control Specification
tcs-bin-cordless 7   TCS-BIN-CORDLESS # Telephony Control Specification
bnep             15  BNEP          # Bluetooth Network Encapsulation Protocol
hid-control      17  HID-Control   # Human Interface Device (control)
hid-interrupt    19  HID-Interrupt # Human Interface Device (interrupt)
upnp             21  UPnP          # See ESDP, Bluetooth SIG
avctp            23  AVCTP         # Audio/Video Control Transport Protocol
avdtp            25  AVDTP         # Audio/Video Distribution Transport Protocol
udi-c-plane      29  UDI-C-Plane   # Unrestricted Digital Information Profile

@


1.3.2.1
log
@file protocols was added on branch RELENG_8_4 on 2013-03-28 13:02:42 +0000
@
text
@d1 22
@


1.3.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 22
# $Id: protocols,v 1.2 2003/05/21 22:17:14 max Exp $
# $FreeBSD: releng/8.4/etc/bluetooth/protocols 152286 2005-11-10 19:09:22Z emax $
#
# Bluetooth Protocol/Service Multiplexor (PSM) names and numbers
#
# See also
# https://www.bluetooth.org/foundry/assignnumb/document/assigned_numbers
#
# Protocol       PSM Alias         Reference

sdp              1   SDP           # Service Discovery Protocol
rfcomm           3   RFCOMM        # RFCOMM with TS 07.10
tcs-bin          5   TCS-BIN       # Telephony Control Specification
tcs-bin-cordless 7   TCS-BIN-CORDLESS # Telephony Control Specification
bnep             15  BNEP          # Bluetooth Network Encapsulation Protocol
hid-control      17  HID-Control   # Human Interface Device (control)
hid-interrupt    19  HID-Interrupt # Human Interface Device (interrupt)
upnp             21  UPnP          # See ESDP, Bluetooth SIG
avctp            23  AVCTP         # Audio/Video Control Transport Protocol
avdtp            25  AVDTP         # Audio/Video Distribution Transport Protocol
udi-c-plane      29  UDI-C-Plane   # Unrestricted Digital Information Profile

@


1.2
log
@Start integrating Bluetooth into rc.d system.

Introduce /etc/rc.d/bluetooth script to start/stop Bluetooth devices. It
will be called from devd(8) in response to device arrival/departure events.
It is also possible to call it by hand to start/stop particular device
without unplugging it.

Introduce generic way to set configuration parameters for Bluetooth devices.
By default /etc/rc.d/bluetooth script has hardwired defaults compatible
with old rc.bluetooth from /usr/share/netgraph/bluetooth/examples. These
can be overridden using /etc/defaults/bluetooth.device.conf file (system
wide defaults). Finally, there could be another device specific override
file located in /etc/bluetooth/$device.conf (where $device is ubt0, btccc0
etc.)

The list of configuration parameters and their meaning described in the
/etc/defaults/bluetooth.device.conf file. Even though Bluetooth device
configuration files are not shell scripts, they must follow basic sh(1) syntax.

The bluetooth.device.conf(5) and handbook update will follow shortly.

Inspired by:	Panagiotis Astithas ( past at ebs dot gr )
Reviewed by:	brooks, yar
MFC after:	1 week
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.2.2.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/7/etc/bluetooth/protocols 152286 2005-11-10 19:09:22Z emax $
@


1.2.16.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.16.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/etc/bluetooth/protocols 152286 2005-11-10 19:09:22Z emax $
@


1.2.16.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.2.16.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/etc/bluetooth/protocols 152286 2005-11-10 19:09:22Z emax $
@


1.2.16.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2.16.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/etc/bluetooth/protocols 152286 2005-11-10 19:09:22Z emax $
@


1.2.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.2.14.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/7.4/etc/bluetooth/protocols 152286 2005-11-10 19:09:22Z emax $
@


1.2.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.2.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.2.10.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/etc/bluetooth/protocols 152286 2005-11-10 19:09:22Z emax $
@


1.2.10.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.10.1.8.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/etc/bluetooth/protocols 152286 2005-11-10 19:09:22Z emax $
@


1.2.10.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.2.10.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.2.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.2.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.2.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.1
log
@Update Bluetooth code.

Reviewed by: M. Warner Losh <imp@@bsdimp.com>; John Hay <jhay@@freebsd.org>
Approved by: M. Warner Losh <imp@@bsdimp.com> (mentor)
@
text
@d6 2
a7 1
# See also http://www.bluetoothsig.org/assigned-numbers/
@


1.1.4.1
log
@MFC: Start Bluetooth integration into rc.d system.

Introduce /etc/rc.d/bluetooth script to start/stop Bluetooth devices. It
will be called from devd(8) in response to device arrival/departure events.
It is also possible to call it by hand to start/stop particular device
without unplugging it.

Introduce generic way to set configuration parameters for Bluetooth devices.
By default /etc/rc.d/bluetooth script has hardwired defaults compatible
with old rc.bluetooth from /usr/share/netgraph/bluetooth/examples. These
can be overridden using /etc/defaults/bluetooth.device.conf file (system
wide defaults). Finally, there could be another device specific override
file located in /etc/bluetooth/$device.conf (where $device is ubt0, btccc0
etc.)

The list of configuration parameters and their meaning described in the
/etc/defaults/bluetooth.device.conf file. Even though Bluetooth device
configuration files are not shell scripts, they must follow basic sh(1) syntax.

Add rc.d scripts for the hcsecd(8) and sdpd(8) daemons. Put defaults into
/etc/defaults/rc.conf. Both daemons can run even if no Bluetooth devices
are attached to the system. Both daemons depend on Bluetooth socket layer.

Fix Bluetooth assigned numbers URL in /etc/bluetooth/protocols file.
@
text
@d6 1
a6 2
# See also
# https://www.bluetooth.org/foundry/assignnumb/document/assigned_numbers
@


1.1.10.1
log
@MFC: Start Bluetooth integration into rc.d system.

Introduce /etc/rc.d/bluetooth script to start/stop Bluetooth devices. It
will be called from devd(8) in response to device arrival/departure events.
It is also possible to call it by hand to start/stop particular device
without unplugging it.

Introduce generic way to set configuration parameters for Bluetooth devices.
By default /etc/rc.d/bluetooth script has hardwired defaults compatible
with old rc.bluetooth from /usr/share/netgraph/bluetooth/examples. These
can be overridden using /etc/defaults/bluetooth.device.conf file (system
wide defaults). Finally, there could be another device specific override
file located in /etc/bluetooth/$device.conf (where $device is ubt0, btccc0
etc.)

The list of configuration parameters and their meaning described in the
/etc/defaults/bluetooth.device.conf file. Even though Bluetooth device
configuration files are not shell scripts, they must follow basic sh(1) syntax.

Add rc.d scripts for the hcsecd(8) and sdpd(8) daemons. Put defaults into
/etc/defaults/rc.conf. Both daemons can run even if no Bluetooth devices
are attached to the system. Both daemons depend on Bluetooth socket layer.

Fix Bluetooth assigned numbers URL in /etc/bluetooth/protocols file.
@
text
@d6 1
a6 2
# See also
# https://www.bluetooth.org/foundry/assignnumb/document/assigned_numbers
@


1.1.10.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/6/etc/bluetooth/protocols 152724 2005-11-23 18:03:33Z emax $
@


1.1.10.1.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


