diff options
| author |   Andre Guedes <andre.guedes@openbossa.org> | 2012-02-17 20:39:37 -0300 |
|---|---|---|
| committer |   Johan Hedberg <johan.hedberg@intel.com> | 2012-02-19 12:34:09 +0200 |
| commit | 343f935bfa44189c68527102c409286b0cfc4526 (patch) | |
| tree | 7597224c044e879c31bda46e32dd5a3f256ffd1b /include/net/bluetooth | |
| parent | Bluetooth: Track discovery type (diff) | |
| download | linux-dev-343f935bfa44189c68527102c409286b0cfc4526.tar.xz linux-dev-343f935bfa44189c68527102c409286b0cfc4526.zip | |
Bluetooth: Merge INQUIRY and LE_SCAN discovery states
This patch merges DISCOVERY_INQUIRY and DISCOVERY_LE_SCAN states
into a new state called DISCOVERY_FINDING.
From the discovery perspective, we are pretty much worried about
to know just if we are finding devices than what exactly phase of
"finding devices" (inquiry or LE scan) we are currently running.
Besides, to know if the controller is performing inquiry or LE scan
we should check HCI_INQUIRY or HCI_LE_SCAN bits in hdev flags.
Moreover, merging this two states will simplify the discovery state
machine and will keep interleaved discovery implementation simpler.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'include/net/bluetooth')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index d7c79b5335c2..942de7764278 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -61,8 +61,7 @@ struct discovery_state { enum { DISCOVERY_STOPPED, DISCOVERY_STARTING, - DISCOVERY_INQUIRY, - DISCOVERY_LE_SCAN, + DISCOVERY_FINDING, DISCOVERY_RESOLVING, DISCOVERY_STOPPING, } state; |