X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fagilent-dmm%2Fapi.c;h=9dcbd230761042590eba8c117fda520693a4a416;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=b7ae7fb280d95ebace2ca9643d34b88107555dbc;hpb=081c214eace0c9088cbcbd9a3d448f6fac5e98f4;p=libsigrok.git diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c index b7ae7fb2..9dcbd230 100644 --- a/src/hardware/agilent-dmm/api.c +++ b/src/hardware/agilent-dmm/api.c @@ -116,7 +116,7 @@ static GSList *scan(GSList *options) return NULL; serial_flush(serial); - if (serial_write_blocking(serial, "*IDN?\r\n", 7) < 7) { + if (serial_write_blocking(serial, "*IDN?\r\n", 7, SERIAL_WRITE_TIMEOUT_MS) < 7) { sr_err("Unable to send identification string."); return NULL; } @@ -136,9 +136,11 @@ static GSList *scan(GSList *options) for (i = 0; supported_agdmm[i].model; i++) { if (strcmp(supported_agdmm[i].modelname, tokens[1])) continue; - if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, "Agilent", - tokens[1], tokens[3]))) - return NULL; + sdi = sr_dev_inst_new(); + sdi->status = SR_ST_INACTIVE; + sdi->vendor = g_strdup("Agilent"); + sdi->model = g_strdup(tokens[1]); + sdi->version = g_strdup(tokens[3]); if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { sr_err("Device context malloc failed."); return NULL;