2019-03-27 10:00:39

by Szymon Janc

[permalink] [raw]
Subject: [PATCH] emulator: Fix handling of Set Event Mask Page 2 Command

This command is also valid for BR/EDR only (was introduced in 3.0)
and for LE only controllers (Authenticated Payload Timeout Expired
Event).
---
emulator/btdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emulator/btdev.c b/emulator/btdev.c
index 4d34aee1a..f4c79c2d0 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -3206,8 +3206,8 @@ static void default_cmd(struct btdev *btdev, uint16_t opcode,
break;

case BT_HCI_CMD_SET_EVENT_MASK_PAGE2:
- if (btdev->type != BTDEV_TYPE_BREDRLE &&
- btdev->type != BTDEV_TYPE_BREDRLE50)
+ if (btdev->type == BTDEV_TYPE_BREDR20 ||
+ btdev->type == BTDEV_TYPE_AMP)
goto unsupported;
semp2 = data;
memcpy(btdev->event_mask_page2, semp2->mask, 8);
--
2.20.1



2019-03-28 13:46:54

by Szymon Janc

[permalink] [raw]
Subject: Re: [PATCH] emulator: Fix handling of Set Event Mask Page 2 Command

On Wednesday, 27 March 2019 11:00:31 CET Szymon Janc wrote:
> This command is also valid for BR/EDR only (was introduced in 3.0)
> and for LE only controllers (Authenticated Payload Timeout Expired
> Event).
> ---
> emulator/btdev.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/emulator/btdev.c b/emulator/btdev.c
> index 4d34aee1a..f4c79c2d0 100644
> --- a/emulator/btdev.c
> +++ b/emulator/btdev.c
> @@ -3206,8 +3206,8 @@ static void default_cmd(struct btdev *btdev, uint16_t
> opcode, break;
>
> case BT_HCI_CMD_SET_EVENT_MASK_PAGE2:
> - if (btdev->type != BTDEV_TYPE_BREDRLE &&
> - btdev->type != BTDEV_TYPE_BREDRLE50)
> + if (btdev->type == BTDEV_TYPE_BREDR20 ||
> + btdev->type == BTDEV_TYPE_AMP)
> goto unsupported;
> semp2 = data;
> memcpy(btdev->event_mask_page2, semp2->mask, 8);

Applied.

--
pozdrawiam
Szymon Janc