if (dlm_model_get(hw_info->model, &model_name, &model_index) != SR_OK)
goto fail;
- if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, MANUFACTURER_NAME,
- model_name, NULL)))
- goto fail;
+ sdi = sr_dev_inst_new();
+ sdi->status = SR_ST_ACTIVE;
+ sdi->vendor = g_strdup(MANUFACTURER_NAME);
+ sdi->model = g_strdup(model_name);
+ sdi->version = g_strdup(hw_info->firmware_version);
+
+ sdi->serial_num = g_strdup(hw_info->serial_number);
sr_scpi_hw_info_free(hw_info);
hw_info = NULL;
model = devc->model_config;
switch (key) {
- case SR_CONF_SCAN_OPTIONS:
- *data = NULL;
- break;
case SR_CONF_DEVICE_OPTIONS:
if (cg_type == CG_NONE) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- model->hw_caps, model->num_hwcaps, sizeof(uint32_t));
+ model->devopts, model->num_devopts, sizeof(uint32_t));
} else if (cg_type == CG_ANALOG) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- model->analog_hwcaps, model->num_analog_hwcaps, sizeof(uint32_t));
+ model->analog_devopts, model->num_analog_devopts, sizeof(uint32_t));
} else {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
NULL, 0, sizeof(uint32_t));