diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-26 22:46:54 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-26 22:46:54 -0800 |
commit | 63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72 (patch) | |
tree | 380eb052c1b93ce11535ffab7f29c4e3d02a7697 /include/net/bluetooth/hci.h | |
parent | 43be63662db56de3f87cb4a86bfe062a9797be65 (diff) | |
parent | b1fb06830dc870d862f7f80e276130c0ab84d59f (diff) | |
download | kernel-crypto-63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72.tar.gz kernel-crypto-63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72.tar.xz kernel-crypto-63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'include/net/bluetooth/hci.h')
-rw-r--r-- | include/net/bluetooth/hci.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 3645139e68c..f69f015bbcc 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -133,8 +133,13 @@ enum { #define ESCO_EV3 0x0008 #define ESCO_EV4 0x0010 #define ESCO_EV5 0x0020 +#define ESCO_2EV3 0x0040 +#define ESCO_3EV3 0x0080 +#define ESCO_2EV5 0x0100 +#define ESCO_3EV5 0x0200 #define SCO_ESCO_MASK (ESCO_HV1 | ESCO_HV2 | ESCO_HV3) +#define EDR_ESCO_MASK (ESCO_2EV3 | ESCO_3EV3 | ESCO_2EV5 | ESCO_3EV5) /* ACL flags */ #define ACL_CONT 0x01 @@ -176,6 +181,9 @@ enum { #define LMP_EV5 0x02 #define LMP_SNIFF_SUBR 0x02 +#define LMP_EDR_ESCO_2M 0x20 +#define LMP_EDR_ESCO_3M 0x40 +#define LMP_EDR_3S_ESCO 0x80 #define LMP_SIMPLE_PAIR 0x08 |