From: Andre Guedes <andre.guedes@openbossa.org>
To: linux-bluetooth@vger.kernel.org
Cc: Andre Guedes <andre.guedes@openbossa.org>
Subject: [RFC 04/16] Code cleanup event.c
Date: Fri, 29 Apr 2011 21:27:20 -0300 [thread overview]
Message-ID: <1304123252-14464-5-git-send-email-andre.guedes@openbossa.org> (raw)
In-Reply-To: <1304123252-14464-1-git-send-email-andre.guedes@openbossa.org>
Remove btd_event_le_set_scan_enable_complete() since it is not
used anymore.
The adapter's state is updated in cc_le_set_scan_enable() which
handles LE Set Scan Enable command complete events.
---
src/event.c | 27 ---------------------------
src/event.h | 1 -
2 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/src/event.c b/src/event.c
index 5373e33..7feec1f 100644
--- a/src/event.c
+++ b/src/event.c
@@ -690,33 +690,6 @@ void btd_event_disconn_complete(bdaddr_t *local, bdaddr_t *peer)
/* Section reserved to device HCI callbacks */
-void btd_event_le_set_scan_enable_complete(bdaddr_t *local, uint8_t status)
-{
- struct btd_adapter *adapter;
- int state;
-
- adapter = manager_find_adapter(local);
- if (!adapter) {
- error("No matching adapter found");
- return;
- }
-
- if (status) {
- error("Can't enable/disable LE scan");
- return;
- }
-
- state = adapter_get_state(adapter);
-
- /* Enabling or disabling ? */
- if (state & STATE_LE_SCAN)
- state &= ~STATE_LE_SCAN;
- else
- state |= STATE_LE_SCAN;
-
- adapter_set_state(adapter, state);
-}
-
void btd_event_returned_link_key(bdaddr_t *local, bdaddr_t *peer)
{
struct btd_adapter *adapter;
diff --git a/src/event.h b/src/event.h
index 765390a..005d8a7 100644
--- a/src/event.h
+++ b/src/event.h
@@ -35,7 +35,6 @@ void btd_event_disconn_complete(bdaddr_t *local, bdaddr_t *peer);
void btd_event_bonding_complete(bdaddr_t *local, bdaddr_t *peer,
uint8_t status);
void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer, uint8_t status);
-void btd_event_le_set_scan_enable_complete(bdaddr_t *local, uint8_t status);
void btd_event_returned_link_key(bdaddr_t *local, bdaddr_t *peer);
int btd_event_user_confirm(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey);
int btd_event_user_passkey(bdaddr_t *sba, bdaddr_t *dba);
--
1.7.1
next prev parent reply other threads:[~2011-04-30 0:27 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-30 0:27 [RFC 00/16] Discovery procedure refactoring Andre Guedes
2011-04-30 0:27 ` [RFC 01/16] Add discovery callbacks to btd_adapter_ops Andre Guedes
2011-04-30 0:27 ` [RFC 02/16] Replace inquiry/scanning calls by discovery calls Andre Guedes
2011-04-30 0:27 ` [RFC 03/16] Add 'discov_state' field to struct dev_info Andre Guedes
2011-04-30 0:27 ` Andre Guedes [this message]
2011-04-30 0:27 ` [RFC 05/16] Remove Periodic Inquiry support in hciops Andre Guedes
2011-05-02 7:38 ` Luiz Augusto von Dentz
2011-05-02 22:35 ` Andre Guedes
2011-04-30 0:27 ` [RFC 06/16] Change DiscoverSchedulerInterval default value Andre Guedes
2011-05-02 7:48 ` Luiz Augusto von Dentz
2011-05-02 22:37 ` Andre Guedes
2011-04-30 0:27 ` [RFC 07/16] Add 'timeout' param to start_scanning callback Andre Guedes
2011-04-30 0:27 ` [RFC 08/16] Refactoring adapter_set_state() Andre Guedes
2011-04-30 0:27 ` [RFC 09/16] Remove 'suspend' param from stop_discovery() Andre Guedes
2011-05-02 8:42 ` Luiz Augusto von Dentz
2011-05-02 22:38 ` Andre Guedes
2011-04-30 0:27 ` [RFC 10/16] Add extfeatures to struct dev_info Andre Guedes
2011-04-30 0:27 ` [RFC 11/16] Implement start_discovery hciops callback Andre Guedes
2011-04-30 0:27 ` [RFC 12/16] Remove obsolete code Andre Guedes
2011-04-30 0:27 ` [RFC 13/16] Implement stop_discovery hciops callback Andre Guedes
2011-04-30 0:27 ` [RFC 14/16] Implement mgmt start and stop discovery Andre Guedes
2011-04-30 0:27 ` [RFC 15/16] Remove inquiry and scanning callbacks from btd_adapter_ops Andre Guedes
2011-04-30 0:27 ` [RFC 16/16] Remove 'periodic' param from hciops_start_inquiry() Andre Guedes
2011-05-02 8:39 ` [RFC 00/16] Discovery procedure refactoring Luiz Augusto von Dentz
2011-05-02 14:01 ` Anderson Lizardo
2011-05-02 22:32 ` Andre Guedes
2011-05-05 8:26 ` Johan Hedberg
2011-05-10 14:03 ` Andre Guedes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1304123252-14464-5-git-send-email-andre.guedes@openbossa.org \
--to=andre.guedes@openbossa.org \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox