X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=763276626111dec61126018424e8792fd0634755;hb=41caa31909882a34b88c8b8a844d555816b78453;hp=eb931e50c4d0309b0cbd5adb6c4fed48a17e83ca;hpb=aed4ad0beaf64062752039a13f9a95326aa1df87;p=libsigrok.git diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c index eb931e50..76327662 100644 --- a/src/hardware/rigol-ds/api.c +++ b/src/hardware/rigol-ds/api.c @@ -291,18 +291,20 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) } } - if (!model || !(sdi = sr_dev_inst_new(SR_ST_ACTIVE, - model->series->vendor->name, - model->name, - hw_info->firmware_version))) { + if (!model) { sr_scpi_hw_info_free(hw_info); return NULL; } + sdi = sr_dev_inst_new(); + sdi->status = SR_ST_ACTIVE; + sdi->vendor = g_strdup(model->series->vendor->name); + sdi->model = g_strdup(model->name); + sdi->version = g_strdup(hw_info->firmware_version); sdi->conn = scpi; - sdi->driver = di; sdi->inst_type = SR_INST_SCPI; + sdi->serial_num = g_strdup(hw_info->serial_number); if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) return NULL;