diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:55:28 +0200 |
| commit | 4feae652c9c12ec4e5ef4c7bd575f8f316494add (patch) | |
| tree | 06571ec9b38fe312cba430092ab4a82ace5c6af1 /src/bluetooth/bluez/bluez_data_p.h | |
| parent | 7761bb88000c19d2f5bfb1182f5c5ddf7dae6c5a (diff) | |
| parent | b0089abb05e6f60cc252068be1ba40be32e29bd3 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I7a55929aefa1f7a4dc96f841317b78b248899f67
Diffstat (limited to 'src/bluetooth/bluez/bluez_data_p.h')
| -rw-r--r-- | src/bluetooth/bluez/bluez_data_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bluetooth/bluez/bluez_data_p.h b/src/bluetooth/bluez/bluez_data_p.h index 25edc661..684cd5b8 100644 --- a/src/bluetooth/bluez/bluez_data_p.h +++ b/src/bluetooth/bluez/bluez_data_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtBluetooth module of the Qt Toolkit. @@ -204,7 +204,10 @@ template<> inline void putBtData(quint128 src, void *dst) // HCI related -#define HCI_MAX_DEV 16 +#define HCI_MAX_DEV 16 +#define HCI_DEV_NONE 0xffff + +#define HCI_CHANNEL_CONTROL 0x3 #define HCI_MAX_EVENT_SIZE 260 |