From: Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFCv3 18/34] Bluetooth: A2MP: Helper functions to count HCI devs
Date: Thu, 19 Jan 2012 11:20:07 +0200 [thread overview]
Message-ID: <1326964823-26747-19-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>
Helper functions used to cound HCI devices (AMP controllers) and
build controller list packet.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
include/net/bluetooth/hci.h | 2 ++
include/net/bluetooth/hci_core.h | 13 +++++++++++++
net/bluetooth/a2mp.c | 31 +++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index dd2cc6c..eed7a55 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -56,6 +56,8 @@
#define HCI_BREDR 0x00
#define HCI_AMP 0x01
+#define HCI_BREDR_ID 0
+
/* HCI device quirks */
enum {
HCI_QUIRK_NO_RESET,
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 18af542..039d8b1 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -606,6 +606,19 @@ static inline struct hci_dev *hci_dev_hold(struct hci_dev *d)
#define hci_dev_lock(d) mutex_lock(&d->lock)
#define hci_dev_unlock(d) mutex_unlock(&d->lock)
+/* hci_dev_list shall be locked */
+static inline uint8_t __hci_num_ctrl(void)
+{
+ uint8_t count = 0;
+ struct list_head *p;
+
+ list_for_each(p, &hci_dev_list) {
+ count++;
+ }
+
+ return count;
+}
+
struct hci_dev *hci_dev_get(int index);
struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst);
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index 2693569..f31cb07 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -13,6 +13,7 @@
*/
#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
#include <net/bluetooth/l2cap.h>
#include <net/bluetooth/a2mp.h>
@@ -64,6 +65,36 @@ static void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len,
kfree(cmd);
}
+static inline void __a2mp_cl_bredr(struct a2mp_cl *cl)
+{
+ cl->id = 0;
+ cl->type = 0;
+ cl->status = 1;
+}
+
+/* hci_dev_list shall be locked */
+static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl, u8 num_ctrl)
+{
+ int i = 0;
+ struct hci_dev *hdev;
+
+ __a2mp_cl_bredr(cl);
+
+ list_for_each_entry(hdev, &hci_dev_list, list) {
+ /* Iterate through AMP controllers */
+ if (hdev->id == HCI_BREDR_ID)
+ continue;
+
+ /* Starting from second entry */
+ if (++i >= num_ctrl)
+ return;
+
+ cl[i].id = hdev->id;
+ cl[i].type = hdev->amp_type;
+ cl[i].status = hdev->amp_status;
+ }
+}
+
/* Processing A2MP messages */
static inline int a2mp_command_rej(struct amp_mgr *mgr, struct sk_buff *skb,
struct a2mp_cmd *hdr)
--
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 ` Emeltchenko Andrei [this message]
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 ` [RFCv3 31/34] Bluetooth: General HCI callback implementation Emeltchenko Andrei
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-19-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).