From: Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFCv3 31/34] Bluetooth: General HCI callback implementation
Date: Thu, 19 Jan 2012 11:20:20 +0200 [thread overview]
Message-ID: <1326964823-26747-32-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1326964823-26747-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Add general HCI callback implementation. Can be used for executing
HCI commands from A2MP protocol.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
include/net/bluetooth/hci_core.h | 18 ++++++++++++
net/bluetooth/hci_core.c | 57 ++++++++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 039d8b1..4ee2065 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -125,6 +125,17 @@ struct adv_entry {
u8 bdaddr_type;
};
+struct hci_dev;
+
+struct cb_cmd {
+ struct list_head list;
+ u16 opcode;
+ u8 status;
+ void *opt;
+ void (*cb)(struct hci_dev *hdev, struct cb_cmd *cmd);
+ void (*destructor)(struct cb_cmd *cmd);
+};
+
#define NUM_REASSEMBLY 4
struct hci_dev {
struct list_head list;
@@ -231,6 +242,7 @@ struct hci_dev {
__u16 init_last_cmd;
struct list_head mgmt_pending;
+ struct list_head cb_list;
struct discovery_state discovery;
struct hci_conn_hash conn_hash;
@@ -1029,4 +1041,10 @@ void hci_le_ltk_neg_reply(struct hci_conn *conn);
int hci_do_inquiry(struct hci_dev *hdev, u8 length);
int hci_cancel_inquiry(struct hci_dev *hdev);
+struct cb_cmd *hci_find_cb(struct hci_dev *hdev, __u16 opcode);
+int hci_cmd_cb(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param,
+ void (*cb)(struct hci_dev *hdev, struct cb_cmd *cmd), void *opt,
+ void (*destructor)(struct cb_cmd *cmd));
+void hci_remove_cb(struct cb_cmd *cmd);
+
#endif /* __HCI_CORE_H */
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 95ece9d..5aefb61 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1678,6 +1678,8 @@ int hci_register_dev(struct hci_dev *hdev)
INIT_LIST_HEAD(&hdev->mgmt_pending);
+ INIT_LIST_HEAD(&hdev->cb_list);
+
INIT_LIST_HEAD(&hdev->blacklist);
INIT_LIST_HEAD(&hdev->uuids);
@@ -2081,6 +2083,61 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param)
return 0;
}
+void hci_add_cb(struct hci_dev *hdev, __u16 opcode,
+ void (*cb)(struct hci_dev *hdev, struct cb_cmd *cmd),
+ void *opt, void (*destructor)(struct cb_cmd *cmd))
+{
+ struct cb_cmd *cmd;
+
+ cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC);
+ if (!cmd)
+ return;
+
+ cmd->cb = cb;
+ cmd->opcode = opcode;
+ cmd->opt = opt;
+ cmd->status = 0;
+
+ if (destructor)
+ cmd->destructor = destructor;
+
+ list_add(&cmd->list, &hdev->cb_list);
+}
+
+struct cb_cmd *hci_find_cb(struct hci_dev *hdev, __u16 opcode)
+{
+ struct cb_cmd *cmd;
+
+ list_for_each_entry(cmd, &hdev->cb_list, list)
+ if (cmd->opcode == opcode)
+ return cmd;
+
+ return NULL;
+}
+
+void hci_remove_cb(struct cb_cmd *cmd)
+{
+ list_del(&cmd->list);
+
+ if (cmd->destructor) {
+ cmd->destructor(cmd);
+ } else {
+ kfree(cmd->opt);
+ kfree(cmd);
+ }
+}
+
+/* Send HCI command with callback */
+int hci_cmd_cb(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param,
+ void (*cb)(struct hci_dev *hdev, struct cb_cmd *cmd),
+ void *opt, void (*destructor)(struct cb_cmd *cmd))
+{
+ if (cb)
+ hci_add_cb(hdev, opcode, cb, opt, destructor);
+
+ return hci_send_cmd(hdev, opcode, plen, param);
+}
+
/* Get data from the previously sent command */
void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode)
{
--
1.7.4.1
next prev parent reply other threads:[~2012-01-19 9:20 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-19 9:19 [RFCv3 00/34] RFC Bluetooth A2MP implementation Emeltchenko Andrei
2012-01-19 9:19 ` [RFCv3 01/34] Bluetooth: trivial: space correction Emeltchenko Andrei
2012-01-19 9:50 ` Marcel Holtmann
2012-01-23 8:58 ` Johan Hedberg
2012-01-19 9:19 ` [RFCv3 02/34] Bluetooth: trivial: clean up of l2cap_chan_connect Emeltchenko Andrei
2012-01-19 9:51 ` Marcel Holtmann
2012-01-19 9:19 ` [RFCv3 03/34] Bluetooth: Make ertm_init available Emeltchenko Andrei
2012-01-19 9:19 ` [RFCv3 04/34] Bluetooth: Make l2cap_ertm_data_rcv available Emeltchenko Andrei
2012-01-19 9:19 ` [RFCv3 05/34] Bluetooth: Allocate skb depending on sk Emeltchenko Andrei
2012-01-19 9:56 ` Marcel Holtmann
2012-01-19 13:18 ` Emeltchenko Andrei
2012-01-19 9:19 ` [RFCv3 06/34] Bluetooth: Check sk before assigning sk_err Emeltchenko Andrei
2012-01-19 9:19 ` [RFCv3 07/34] Bluetooth: Add send function to chan ops Emeltchenko Andrei
2012-01-19 9:19 ` [RFCv3 08/34] Bluetooth: Make l2cap_chan_add available Emeltchenko Andrei
2012-01-19 9:19 ` [RFCv3 09/34] Bluetooth: A2MP: Create A2MP channel Emeltchenko Andrei
2012-01-19 9:19 ` [RFCv3 10/34] Bluetooth: A2MP: AMP Manager basic functions Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 11/34] Bluetooth: A2MP: Add channel close callback Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 12/34] Bluetooth: Add state_change for A2MP channel Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 13/34] Bluetooth: A2MP: Build and Send msg helpers Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 14/34] Bluetooth: A2MP: Definitions for A2MP commands Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 15/34] Bluetooth: A2MP: Define A2MP status codes Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 16/34] Bluetooth: A2MP: Process A2MP messages Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 17/34] Bluetooth: A2MP: Process A2MP Command Reject Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 18/34] Bluetooth: A2MP: Helper functions to count HCI devs Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 19/34] Bluetooth: A2MP: Process A2MP Discover Request Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 20/34] Bluetooth: A2MP: Process A2MP Change Notify Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 21/34] Bluetooth: A2MP: Process A2MP Get Info Request Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 22/34] Bluetooth: A2MP: Process A2MP Get AMP Assoc Request Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 23/34] Bluetooth: A2MP: Process A2MP Create Physlink Request Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 24/34] Bluetooth: A2MP: Process A2MP Disc " Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 25/34] Bluetooth: A2MP: Process A2MP Command Responses Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 26/34] Bluetooth: Clean up l2cap_chan_add Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 27/34] Bluetooth: A2MP: Handling fixed channels Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 28/34] Bluetooth: A2MP: Manage incoming connections Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 29/34] Bluetooth: physical link HCI interface to AMP Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 30/34] Bluetooth: Define AMP controller statuses Emeltchenko Andrei
2012-01-19 9:20 ` Emeltchenko Andrei [this message]
2012-01-19 9:20 ` [RFCv3 32/34] Bluetooth: Process HCI callbacks in a workqueue Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 33/34] Bluetooth: AMP: Use HCI callback for Read AMP Info Emeltchenko Andrei
2012-01-19 9:20 ` [RFCv3 34/34] Bluetooth: AMP: Read Local Assoc support Emeltchenko Andrei
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=1326964823-26747-32-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).