Return-Path: Date: Tue, 26 Apr 2011 13:07:46 -0300 From: "Gustavo F. Padovan" To: anderson.briglia@openbossa.org Cc: linux-bluetooth@vger.kernel.org, Johan Hedberg Subject: Re: [PATCH 2/2] Bluetooth: Add discovering event to the Management interface Message-ID: <20110426160746.GB2242@joana> References: <1303430430-11160-1-git-send-email-y> <4db0c547.0f44970a.646e.62f9@mx.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <4db0c547.0f44970a.646e.62f9@mx.google.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: * anderson.briglia@openbossa.org [2011-04-21 20:00:30 -0400]: > From: Johan Hedberg > > This patch adds a new event to the Management interface to track when > local adapters are discovering remote devices. For now this only tracks > BR/EDR discovery procedures. > > Signed-off-by: Johan Hedberg > Signed-off-by: Anderson Briglia > --- > include/net/bluetooth/hci_core.h | 1 + > include/net/bluetooth/mgmt.h | 2 + > net/bluetooth/hci_event.c | 44 +++++++++++++++++++++++++++++++++++-- > net/bluetooth/mgmt.c | 6 +++++ > 4 files changed, 50 insertions(+), 3 deletions(-) > > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h > index 4093133..69967e5 100644 > --- a/include/net/bluetooth/hci_core.h > +++ b/include/net/bluetooth/hci_core.h > @@ -790,6 +790,7 @@ int mgmt_read_local_oob_data_reply_complete(u16 index, u8 *hash, u8 *randomizer, > int mgmt_device_found(u16 index, bdaddr_t *bdaddr, u8 *dev_class, s8 rssi, > u8 *eir); > int mgmt_remote_name(u16 index, bdaddr_t *bdaddr, u8 *name); > +int mgmt_discovering(u16 index, u8 discovering); > > /* HCI info for socket */ > #define hci_pi(sk) ((struct hci_pinfo *) sk) > diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h > index be93dd0..7434406 100644 > --- a/include/net/bluetooth/mgmt.h > +++ b/include/net/bluetooth/mgmt.h > @@ -285,3 +285,5 @@ struct mgmt_ev_remote_name { > bdaddr_t bdaddr; > __u8 name[MGMT_MAX_NAME_LENGTH]; > } __packed; > + > +#define MGMT_EV_DISCOVERING 0x0014 > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index c7eb073..f356ed7 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -56,6 +56,10 @@ static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb) > if (status) > return; > > + if (test_bit(HCI_MGMT, &hdev->flags) && > + test_bit(HCI_INQUIRY, &hdev->flags)) > + mgmt_discovering(hdev->id, 0); > + > clear_bit(HCI_INQUIRY, &hdev->flags); > > hci_req_complete(hdev, HCI_OP_INQUIRY_CANCEL, status); > @@ -72,6 +76,10 @@ static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb) > if (status) > return; > > + if (test_bit(HCI_MGMT, &hdev->flags) && > + test_bit(HCI_INQUIRY, &hdev->flags)) > + mgmt_discovering(hdev->id, 0); > + > clear_bit(HCI_INQUIRY, &hdev->flags); > > hci_conn_check_pending(hdev); > @@ -841,10 +849,15 @@ static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status) > > if (status) { > hci_req_complete(hdev, HCI_OP_INQUIRY, status); > - > hci_conn_check_pending(hdev); > - } else > - set_bit(HCI_INQUIRY, &hdev->flags); > + return; > + } > + > + if (test_bit(HCI_MGMT, &hdev->flags) && > + !test_bit(HCI_INQUIRY, &hdev->flags)) > + mgmt_discovering(hdev->id, 1); > + > + set_bit(HCI_INQUIRY, &hdev->flags); > } > > static inline void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) > @@ -1208,6 +1221,10 @@ static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff > > BT_DBG("%s status %d", hdev->name, status); > > + if (test_bit(HCI_MGMT, &hdev->flags) && > + test_bit(HCI_INQUIRY, &hdev->flags)) > + mgmt_discovering(hdev->id, 0); > + > clear_bit(HCI_INQUIRY, &hdev->flags); > > hci_req_complete(hdev, HCI_OP_INQUIRY, status); > @@ -1228,6 +1245,13 @@ static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff * > > hci_dev_lock(hdev); > > + if (!test_bit(HCI_INQUIRY, &hdev->flags)) { > + set_bit(HCI_INQUIRY, &hdev->flags); > + > + if (test_bit(HCI_MGMT, &hdev->flags)) > + mgmt_discovering(hdev->id, 1); > + } > + > for (; num_rsp; num_rsp--, info++) { > bacpy(&data.bdaddr, &info->bdaddr); > data.pscan_rep_mode = info->pscan_rep_mode; > @@ -2158,6 +2182,13 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct > > hci_dev_lock(hdev); > > + if (!test_bit(HCI_INQUIRY, &hdev->flags)) { > + set_bit(HCI_INQUIRY, &hdev->flags); This can be !test_and_set_bit() > + > + if (test_bit(HCI_MGMT, &hdev->flags)) > + mgmt_discovering(hdev->id, 1); > + } > + > if ((skb->len - 1) / num_rsp != sizeof(struct inquiry_info_with_rssi)) { > struct inquiry_info_with_rssi_and_pscan_mode *info; > info = (void *) (skb->data + 1); > @@ -2320,6 +2351,13 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct > if (!num_rsp) > return; > > + if (!test_bit(HCI_INQUIRY, &hdev->flags)) { > + set_bit(HCI_INQUIRY, &hdev->flags); Same here and other places in the code. -- Gustavo F. Padovan http://profusion.mobi