X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=48e9a0ced109be33d1537bb4565c79da6acc2cdb;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=cd33eb1a27311ab30b29a3c71529433eb99e7912;hpb=d4ccb6bd8fed2354eac92ea66ffdb274f0f78702;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c index cd33eb1a..48e9a0ce 100644 --- a/src/hardware/yokogawa-dlm/api.c +++ b/src/hardware/yokogawa-dlm/api.c @@ -62,9 +62,13 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi) 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; @@ -483,7 +487,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * 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_devopts, model->num_analog_devopts, 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));