2011-11-30 14:17:10

by Andrei Emeltchenko

Subject: [PATCH] Bluetooth: Remove magic numbers from le scan cmd

From: Andrei Emeltchenko <[email protected]>

Make code readable by removing magic numbers.

Signed-off-by: Andrei Emeltchenko <[email protected]>
---
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

2011-11-30 14:27:27

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: Remove magic numbers from le scan cmd

Hi Andrei,

> Make code readable by removing magic numbers.
>
> Signed-off-by: Andrei Emeltchenko <[email protected]>
> ---
> include/net/bluetooth/hci.h | 3 +++
> net/bluetooth/hci_event.c | 12 ++++++++++--
> 2 files changed, 13 insertions(+), 2 deletions(-)

Acked-by: Marcel Holtmann <[email protected]>

Regards

Marcel

2011-12-22 16:03:50

by Gustavo Padovan

Subject: Re: [PATCH] Bluetooth: Remove magic numbers from le scan cmd

Hi Andrei,

* Emeltchenko Andrei <[email protected]> [2011-12-19 16:14:18 +0200]:

> From: Andrei Emeltchenko <[email protected]>
>
> Make code readable by removing magic numbers.
>
> Signed-off-by: Andrei Emeltchenko <[email protected]>
> Acked-by: Marcel Holtmann <[email protected]>
> ---
> 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

2011-12-21 12:53:45

by Andrei Emeltchenko

Subject: Re: [PATCH] Bluetooth: Remove magic numbers from le scan cmd

On Mon, Dec 19, 2011 at 04:14:18PM +0200, Emeltchenko Andrei wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> Make code readable by removing magic numbers.

Gustavo what do you think about this one?

Best regards
Andrei Emeltchenko

>
> Signed-off-by: Andrei Emeltchenko <[email protected]>
> Acked-by: Marcel Holtmann <[email protected]>
> ---
> 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;
> }
> }

2011-12-02 11:59:10

by Gustavo Padovan

Subject: Re: [PATCH] Bluetooth: Remove magic numbers from le scan cmd

* Emeltchenko Andrei <[email protected]> [2011-11-30 16:17:10 +0200]:

> From: Andrei Emeltchenko <[email protected]>
>
> Make code readable by removing magic numbers.
>
> Signed-off-by: Andrei Emeltchenko <[email protected]>
> ---
> include/net/bluetooth/hci.h | 3 +++
> net/bluetooth/hci_event.c | 12 ++++++++++--
> 2 files changed, 13 insertions(+), 2 deletions(-)

Applied, thanks.

Gustavo