mgmt-tester: Update set_connectable_off_adv_param
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Tue, 3 Nov 2020 23:38:56 +0000 (15:38 -0800)
committerAyush Garg <ayush.garg@samsung.com>
Fri, 11 Mar 2022 13:38:33 +0000 (19:08 +0530)
Parameters have been changed in the kernel which now uses the following:

< HCI Command: LE Set Advertising Parameters (0x08|0x0006) plen 15
        Min advertising interval: 62.500 msec (0x0064)
        Max advertising interval: 93.750 msec (0x0096)
        Type: Scannable undirected - ADV_SCAN_IND (0x02)
        Own address type: Random (0x01)
        Direct address type: Public (0x00)
        Direct address: 00:00:00:00:00:00 (OUI 00-00-00)
        Channel map: 37, 38, 39 (0x07)
        Filter policy: Allow Scan Request from Any, Allow Connect Request from Any (0x00)

Signed-off-by: Anuj Jain <anuj01.jain@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>
tools/mgmt-tester.c

index 4775fb1..55df295 100755 (executable)
@@ -898,10 +898,10 @@ static uint16_t settings_powered_le_connectable_advertising[] = {
                                        MGMT_OP_SET_ADVERTISING,
                                        MGMT_OP_SET_POWERED, 0 };
 
-static uint8_t set_connectable_off_adv_param[] = {
-               0x00, 0x08,                             /* min_interval */
-               0x00, 0x08,                             /* max_interval */
-               0x03,                                   /* type */
+static uint8_t set_connectable_off_scan_adv_param[] = {
+               0x64, 0x00,                             /* min_interval */
+               0x96, 0x00,                             /* max_interval */
+               0x02,                                   /* type */
                0x01,                                   /* own_addr_type */
                0x00,                                   /* direct_addr_type */
                0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* direct_addr */
@@ -919,8 +919,8 @@ static const struct generic_data set_connectable_off_le_test_2 = {
        .expect_len = sizeof(set_connectable_off_le_settings_2),
        .expect_settings_unset = MGMT_SETTING_CONNECTABLE,
        .expect_hci_command = BT_HCI_CMD_LE_SET_ADV_PARAMETERS,
-       .expect_hci_param = set_connectable_off_adv_param,
-       .expect_hci_len = sizeof(set_connectable_off_adv_param),
+       .expect_hci_param = set_connectable_off_scan_adv_param,
+       .expect_hci_len = sizeof(set_connectable_off_scan_adv_param),
 };
 
 static uint16_t settings_powered_le_discoverable[] = {
@@ -946,8 +946,8 @@ static const struct generic_data set_connectable_off_le_test_3 = {
        .expect_len = sizeof(set_connectable_off_le_settings_2),
        .expect_settings_unset = MGMT_SETTING_CONNECTABLE,
        .expect_hci_command = BT_HCI_CMD_LE_SET_ADV_PARAMETERS,
-       .expect_hci_param = set_connectable_off_adv_param,
-       .expect_hci_len = sizeof(set_connectable_off_adv_param),
+       .expect_hci_param = set_connectable_off_scan_adv_param,
+       .expect_hci_len = sizeof(set_connectable_off_scan_adv_param),
 };
 
 static const struct generic_data set_connectable_off_le_test_4 = {
@@ -961,8 +961,8 @@ static const struct generic_data set_connectable_off_le_test_4 = {
        .expect_len = sizeof(set_connectable_off_le_settings_2),
        .expect_settings_unset = MGMT_SETTING_CONNECTABLE,
        .expect_hci_command = BT_HCI_CMD_LE_SET_ADV_PARAMETERS,
-       .expect_hci_param = set_connectable_off_adv_param,
-       .expect_hci_len = sizeof(set_connectable_off_adv_param),
+       .expect_hci_param = set_connectable_off_scan_adv_param,
+       .expect_hci_len = sizeof(set_connectable_off_scan_adv_param),
 };
 
 static const char set_fast_conn_on_param[] = { 0x01 };
@@ -4738,17 +4738,6 @@ static uint16_t settings_powered_le_connectable[] = {
                                                MGMT_OP_SET_LE,
                                                MGMT_OP_SET_CONNECTABLE, 0 };
 
-static uint8_t set_connectable_off_scan_adv_param[] = {
-               0x00, 0x08,                             /* min_interval */
-               0x00, 0x08,                             /* max_interval */
-               0x02,                                   /* type */
-               0x01,                                   /* own_addr_type */
-               0x00,                                   /* direct_addr_type */
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* direct_addr */
-               0x07,                                   /* channel_map */
-               0x00,                                   /* filter_policy */
-};
-
 static const struct generic_data add_advertising_success_13 = {
        .setup_settings = settings_powered_le,
        .send_opcode = MGMT_OP_ADD_ADVERTISING,
@@ -4762,6 +4751,17 @@ static const struct generic_data add_advertising_success_13 = {
        .expect_hci_len = sizeof(set_connectable_off_scan_adv_param),
 };
 
+static uint8_t set_connectable_off_adv_param[] = {
+               0x64, 0x00,                             /* min_interval */
+               0x96, 0x00,                             /* max_interval */
+               0x03,                                   /* type */
+               0x01,                                   /* own_addr_type */
+               0x00,                                   /* direct_addr_type */
+               0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* direct_addr */
+               0x07,                                   /* channel_map */
+               0x00,                                   /* filter_policy */
+};
+
 static const struct generic_data add_advertising_success_14 = {
        .setup_settings = settings_powered_le,
        .send_opcode = MGMT_OP_ADD_ADVERTISING,