const void *setup_send_param;
uint16_t setup_send_len;
const struct setup_mgmt_cmd *setup_mgmt_cmd_arr;
+ size_t setup_mgmt_cmd_arr_size;
bool send_index_none;
const void *setup_discovery_param;
uint16_t send_opcode;
.send_opcode = MGMT_OP_SET_LOCAL_NAME,
.send_param = set_adv_set_local_name_param,
.send_len = sizeof(set_adv_set_local_name_param),
- },
- { /* last element should always have opcode 0x00 */
- .send_opcode = 0x00,
- .send_param = NULL,
- .send_len = 0,
}
};
static const struct generic_data set_adv_on_local_name_appear_test_1 = {
.setup_settings = settings_powered_le,
.setup_mgmt_cmd_arr = set_advertising_mgmt_cmd_arr,
+ .setup_mgmt_cmd_arr_size = ARRAY_SIZE(set_advertising_mgmt_cmd_arr),
.send_opcode = MGMT_OP_SET_ADVERTISING,
.send_param = set_adv_on_param,
.expect_param = set_adv_settings_param_2,
.send_opcode = MGMT_OP_ADD_UUID,
.send_param = add_spp_uuid_param,
.send_len = sizeof(add_spp_uuid_param),
- },
- { /* last element should always have opcode 0x00 */
- .send_opcode = 0x00,
- .send_param = NULL,
- .send_len = 0,
}
};
static const struct generic_data read_ext_ctrl_info2 = {
.setup_settings = settings_powered_le,
.setup_mgmt_cmd_arr = set_dev_class_cmd_arr1,
+ .setup_mgmt_cmd_arr_size = ARRAY_SIZE(set_dev_class_cmd_arr1),
.send_opcode = MGMT_OP_READ_EXT_INFO,
.expect_status = MGMT_STATUS_SUCCESS,
.expect_param = ext_ctrl_info2,
.send_opcode = MGMT_OP_SET_LOCAL_NAME,
.send_param = &set_local_name_cp,
.send_len = sizeof(set_local_name_cp),
- },
- { /* last element should always have opcode 0x00 */
- .send_opcode = 0x00,
- .send_param = NULL,
- .send_len = 0,
}
};
static const struct generic_data read_ext_ctrl_info5 = {
.setup_settings = settings_powered_le,
.setup_mgmt_cmd_arr = set_dev_class_cmd_arr2,
+ .setup_mgmt_cmd_arr_size = ARRAY_SIZE(set_dev_class_cmd_arr2),
.send_opcode = MGMT_OP_READ_EXT_INFO,
.expect_status = MGMT_STATUS_SUCCESS,
.expect_param = ext_ctrl_info5,
const struct generic_data *test = data->test_data;
const void *send_param = test->setup_send_param;
uint16_t send_len = test->setup_send_len;
- size_t i = 0;
+ size_t i;
if (test->setup_expect_hci_command) {
tester_print("Registering setup expected HCI command callback");
}
tester_print("Sending setup opcode array");
- for (; test->setup_mgmt_cmd_arr + i; ++i) {
- const struct setup_mgmt_cmd *cmd = test->setup_mgmt_cmd_arr + i;
-
- if (cmd->send_opcode == 0x00)
- break;
+ for (i = 0; i < test->setup_mgmt_cmd_arr_size; ++i) {
+ const struct setup_mgmt_cmd *cmd = &test->setup_mgmt_cmd_arr[i];
tester_print("Setup sending %s (0x%04x)",
mgmt_opstr(cmd->send_opcode),
static const struct generic_data add_advertising_name_data_appear = {
.setup_settings = settings_powered_le,
.setup_mgmt_cmd_arr = add_advertising_mgmt_cmd_arr,
+ .setup_mgmt_cmd_arr_size = ARRAY_SIZE(add_advertising_mgmt_cmd_arr),
.send_opcode = MGMT_OP_ADD_ADVERTISING,
.send_param = add_advertising_param_name_data_appear,
.send_len = sizeof(add_advertising_param_name_data_appear),
static const struct generic_data add_ext_advertising_name_data_appear = {
.setup_settings = settings_powered_le,
.setup_mgmt_cmd_arr = add_advertising_mgmt_cmd_arr,
+ .setup_mgmt_cmd_arr_size = ARRAY_SIZE(add_advertising_mgmt_cmd_arr),
.send_opcode = MGMT_OP_ADD_ADVERTISING,
.send_param = add_advertising_param_name_data_appear,
.send_len = sizeof(add_advertising_param_name_data_appear),