* [PATCH] Bluetooth: Remove magic numbers from le scan cmd
@ 2011-11-30 14:17 Emeltchenko Andrei
2011-11-30 14:27 ` Marcel Holtmann
2011-12-02 11:59 ` Gustavo Padovan
0 siblings, 2 replies; 9+ messages in thread
From: Emeltchenko Andrei @ 2011-11-30 14:17 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Make code readable by removing magic numbers.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
include/net/bluetooth/hci.h | 3 +++
net/bluetooth/hci_event.c | 12 ++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b0a801b..a913001 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -821,6 +821,9 @@ struct hci_rp_le_read_buffer_size {
__u8 le_max_pkt;
} __packed;
+#define LE_SCANNING_DISABLED 0x00
+#define LE_SCANNING_ENABLED 0x01
+
#define HCI_OP_LE_SET_SCAN_ENABLE 0x200c
struct hci_cp_le_set_scan_enable {
__u8 enable;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index fa66d88..65ca922 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1011,14 +1011,22 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
if (!cp)
return;
- if (cp->enable == 0x01) {
+ switch (cp->enable) {
+ case LE_SCANNING_ENABLED:
del_timer(&hdev->adv_timer);
hci_dev_lock(hdev);
hci_adv_entries_clear(hdev);
hci_dev_unlock(hdev);
- } else if (cp->enable == 0x00) {
+ break;
+
+ case LE_SCANNING_DISABLED:
mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT);
+ break;
+
+ default:
+ BT_ERR("Used reserved LE_Scan_Enable param %d", cp->enable);
+ break;
}
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] Bluetooth: Remove magic numbers from le scan cmd
2011-11-30 14:17 [PATCH] Bluetooth: Remove magic numbers from le scan cmd Emeltchenko Andrei
@ 2011-11-30 14:27 ` Marcel Holtmann
2011-12-02 11:59 ` Gustavo Padovan
1 sibling, 0 replies; 9+ messages in thread
From: Marcel Holtmann @ 2011-11-30 14:27 UTC (permalink / raw)
To: Emeltchenko Andrei; +Cc: linux-bluetooth
Hi Andrei,
> Make code readable by removing magic numbers.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> include/net/bluetooth/hci.h | 3 +++
> net/bluetooth/hci_event.c | 12 ++++++++++--
> 2 files changed, 13 insertions(+), 2 deletions(-)
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Regards
Marcel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] Bluetooth: Remove magic numbers from le scan cmd
2011-11-30 14:17 [PATCH] Bluetooth: Remove magic numbers from le scan cmd Emeltchenko Andrei
2011-11-30 14:27 ` Marcel Holtmann
@ 2011-12-02 11:59 ` Gustavo Padovan
2011-12-02 23:33 ` Gustavo Padovan
1 sibling, 1 reply; 9+ messages in thread
From: Gustavo Padovan @ 2011-12-02 11:59 UTC (permalink / raw)
To: Emeltchenko Andrei; +Cc: linux-bluetooth
* Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com> [2011-11-30 16:17:10 +0200]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> Make code readable by removing magic numbers.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> include/net/bluetooth/hci.h | 3 +++
> net/bluetooth/hci_event.c | 12 ++++++++++--
> 2 files changed, 13 insertions(+), 2 deletions(-)
Applied, thanks.
Gustavo
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] Bluetooth: Remove magic numbers from le scan cmd
2011-12-02 11:59 ` Gustavo Padovan
@ 2011-12-02 23:33 ` Gustavo Padovan
2011-12-05 9:27 ` Emeltchenko Andrei
0 siblings, 1 reply; 9+ messages in thread
From: Gustavo Padovan @ 2011-12-02 23:33 UTC (permalink / raw)
To: Emeltchenko Andrei, linux-bluetooth
Hi Andrei,
* Gustavo Padovan <padovan@profusion.mobi> [2011-12-02 20:59:10 +0900]:
> * Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com> [2011-11-30 16:17:10 +0200]:
>
> > From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> >
> > Make code readable by removing magic numbers.
> >
> > Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> > ---
> > include/net/bluetooth/hci.h | 3 +++
> > net/bluetooth/hci_event.c | 12 ++++++++++--
> > 2 files changed, 13 insertions(+), 2 deletions(-)
>
> Applied, thanks.
I stepped back with this one to apply Andre's patches. Yours is trivial and
can wait a bit. Care to resend it?
Gustavo
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] Bluetooth: Remove magic numbers from le scan cmd
@ 2011-12-05 9:26 Emeltchenko Andrei
0 siblings, 0 replies; 9+ messages in thread
From: Emeltchenko Andrei @ 2011-12-05 9:26 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Make code readable by removing magic numbers.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
---
include/net/bluetooth/hci.h | 3 +++
net/bluetooth/hci_event.c | 14 ++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 67ad984..5f8af41 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -791,6 +791,9 @@ struct hci_cp_le_set_scan_param {
__u8 filter_policy;
} __packed;
+#define LE_SCANNING_DISABLED 0x00
+#define LE_SCANNING_ENABLED 0x01
+
#define HCI_OP_LE_SET_SCAN_ENABLE 0x200c
struct hci_cp_le_set_scan_enable {
__u8 enable;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 35cb56e..447071a 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1014,18 +1014,24 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
if (!cp)
return;
- if (cp->enable == 0x01) {
+ switch (cp->enable) {
+ case LE_SCANNING_ENABLED:
set_bit(HCI_LE_SCAN, &hdev->dev_flags);
-
del_timer(&hdev->adv_timer);
hci_dev_lock(hdev);
hci_adv_entries_clear(hdev);
hci_dev_unlock(hdev);
- } else if (cp->enable == 0x00) {
- clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
+ break;
+ case LE_SCANNING_DISABLED:
+ clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT);
+ break;
+
+ default:
+ BT_ERR("Used reserved LE_Scan_Enable param %d", cp->enable);
+ break;
}
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] Bluetooth: Remove magic numbers from le scan cmd
2011-12-02 23:33 ` Gustavo Padovan
@ 2011-12-05 9:27 ` Emeltchenko Andrei
0 siblings, 0 replies; 9+ messages in thread
From: Emeltchenko Andrei @ 2011-12-05 9:27 UTC (permalink / raw)
To: linux-bluetooth
Hi Gustavo,
On Sat, Dec 03, 2011 at 08:33:23AM +0900, Gustavo Padovan wrote:
> Hi Andrei,
>
> * Gustavo Padovan <padovan@profusion.mobi> [2011-12-02 20:59:10 +0900]:
>
> > * Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com> [2011-11-30 16:17:10 +0200]:
> >
> > > From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> > >
> > > Make code readable by removing magic numbers.
> > >
> > > Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> > > ---
> > > include/net/bluetooth/hci.h | 3 +++
> > > net/bluetooth/hci_event.c | 12 ++++++++++--
> > > 2 files changed, 13 insertions(+), 2 deletions(-)
> >
> > Applied, thanks.
>
> I stepped back with this one to apply Andre's patches. Yours is trivial and
> can wait a bit. Care to resend it?
I have rebased and resent the patch.
Best regards
Andrei Emeltchenko
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] Bluetooth: Remove magic numbers from le scan cmd
@ 2011-12-19 14:14 Emeltchenko Andrei
2011-12-21 12:53 ` Emeltchenko Andrei
2011-12-22 16:03 ` Gustavo Padovan
0 siblings, 2 replies; 9+ messages in thread
From: Emeltchenko Andrei @ 2011-12-19 14:14 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Make code readable by removing magic numbers.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
---
include/net/bluetooth/hci.h | 3 +++
net/bluetooth/hci_event.c | 12 ++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 2e48d32..c019b27 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -800,6 +800,9 @@ struct hci_cp_le_set_scan_param {
__u8 filter_policy;
} __packed;
+#define LE_SCANNING_DISABLED 0x00
+#define LE_SCANNING_ENABLED 0x01
+
#define HCI_OP_LE_SET_SCAN_ENABLE 0x200c
struct hci_cp_le_set_scan_enable {
__u8 enable;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index fc5338f..4275816 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1030,7 +1030,8 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
if (!cp)
return;
- if (cp->enable == 0x01) {
+ switch (cp->enable) {
+ case LE_SCANNING_ENABLED:
set_bit(HCI_LE_SCAN, &hdev->dev_flags);
cancel_delayed_work_sync(&hdev->adv_work);
@@ -1038,12 +1039,19 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
hci_dev_lock(hdev);
hci_adv_entries_clear(hdev);
hci_dev_unlock(hdev);
- } else if (cp->enable == 0x00) {
+ break;
+
+ case LE_SCANNING_DISABLED:
clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
cancel_delayed_work_sync(&hdev->adv_work);
queue_delayed_work(hdev->workqueue, &hdev->adv_work,
jiffies + ADV_CLEAR_TIMEOUT);
+ break;
+
+ default:
+ BT_ERR("Used reserved LE_Scan_Enable param %d", cp->enable);
+ break;
}
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] Bluetooth: Remove magic numbers from le scan cmd
2011-12-19 14:14 Emeltchenko Andrei
@ 2011-12-21 12:53 ` Emeltchenko Andrei
2011-12-22 16:03 ` Gustavo Padovan
1 sibling, 0 replies; 9+ messages in thread
From: Emeltchenko Andrei @ 2011-12-21 12:53 UTC (permalink / raw)
To: linux-bluetooth
On Mon, Dec 19, 2011 at 04:14:18PM +0200, Emeltchenko Andrei wrote:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> Make code readable by removing magic numbers.
Gustavo what do you think about this one?
Best regards
Andrei Emeltchenko
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> Acked-by: Marcel Holtmann <marcel@holtmann.org>
> ---
> include/net/bluetooth/hci.h | 3 +++
> net/bluetooth/hci_event.c | 12 ++++++++++--
> 2 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> index 2e48d32..c019b27 100644
> --- a/include/net/bluetooth/hci.h
> +++ b/include/net/bluetooth/hci.h
> @@ -800,6 +800,9 @@ struct hci_cp_le_set_scan_param {
> __u8 filter_policy;
> } __packed;
>
> +#define LE_SCANNING_DISABLED 0x00
> +#define LE_SCANNING_ENABLED 0x01
> +
> #define HCI_OP_LE_SET_SCAN_ENABLE 0x200c
> struct hci_cp_le_set_scan_enable {
> __u8 enable;
> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> index fc5338f..4275816 100644
> --- a/net/bluetooth/hci_event.c
> +++ b/net/bluetooth/hci_event.c
> @@ -1030,7 +1030,8 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
> if (!cp)
> return;
>
> - if (cp->enable == 0x01) {
> + switch (cp->enable) {
> + case LE_SCANNING_ENABLED:
> set_bit(HCI_LE_SCAN, &hdev->dev_flags);
>
> cancel_delayed_work_sync(&hdev->adv_work);
> @@ -1038,12 +1039,19 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
> hci_dev_lock(hdev);
> hci_adv_entries_clear(hdev);
> hci_dev_unlock(hdev);
> - } else if (cp->enable == 0x00) {
> + break;
> +
> + case LE_SCANNING_DISABLED:
> clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
>
> cancel_delayed_work_sync(&hdev->adv_work);
> queue_delayed_work(hdev->workqueue, &hdev->adv_work,
> jiffies + ADV_CLEAR_TIMEOUT);
> + break;
> +
> + default:
> + BT_ERR("Used reserved LE_Scan_Enable param %d", cp->enable);
> + break;
> }
> }
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] Bluetooth: Remove magic numbers from le scan cmd
2011-12-19 14:14 Emeltchenko Andrei
2011-12-21 12:53 ` Emeltchenko Andrei
@ 2011-12-22 16:03 ` Gustavo Padovan
1 sibling, 0 replies; 9+ messages in thread
From: Gustavo Padovan @ 2011-12-22 16:03 UTC (permalink / raw)
To: Emeltchenko Andrei; +Cc: linux-bluetooth
Hi Andrei,
* Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com> [2011-12-19 16:14:18 +0200]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> Make code readable by removing magic numbers.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> Acked-by: Marcel Holtmann <marcel@holtmann.org>
> ---
> include/net/bluetooth/hci.h | 3 +++
> net/bluetooth/hci_event.c | 12 ++++++++++--
> 2 files changed, 13 insertions(+), 2 deletions(-)
Patch has been applied, thanks.
Gustavo
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-12-22 16:03 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-30 14:17 [PATCH] Bluetooth: Remove magic numbers from le scan cmd Emeltchenko Andrei
2011-11-30 14:27 ` Marcel Holtmann
2011-12-02 11:59 ` Gustavo Padovan
2011-12-02 23:33 ` Gustavo Padovan
2011-12-05 9:27 ` Emeltchenko Andrei
-- strict thread matches above, loose matches on Subject: below --
2011-12-05 9:26 Emeltchenko Andrei
2011-12-19 14:14 Emeltchenko Andrei
2011-12-21 12:53 ` Emeltchenko Andrei
2011-12-22 16:03 ` Gustavo Padovan
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).