X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=ab9b36e292d047feb3713e1658c7dcae8ee96c0b;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=e1929bd70a6069f2885420a39b4a8592e0cc247d;hpb=d12ef776d3e81f30ca75bbdab7ea96341ad930a4;p=libsigrok.git diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c index e1929bd7..ab9b36e2 100644 --- a/src/hardware/norma-dmm/api.c +++ b/src/hardware/norma-dmm/api.c @@ -129,7 +129,7 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options) nmadmm_requests[NMADMM_REQ_IDN].req_str); g_usleep(150 * 1000); /* Wait a little to allow serial port to settle. */ for (cnt = 0; cnt < 7; cnt++) { - if (serial_write_blocking(serial, req, strlen(req)) < 0) { + if (serial_write_blocking(serial, req, strlen(req), 0) < 0) { sr_err("Unable to send identification request."); return NULL; } @@ -144,9 +144,11 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options) auxtype = xgittoint(buf[7]); sr_spew("%s %s DMM %s detected!", get_brandstr(drv), get_typestr(auxtype, drv), buf + 9); - if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, - get_brandstr(drv), get_typestr(auxtype, drv), buf + 9))) - return NULL; + sdi = sr_dev_inst_new(); + sdi->status = SR_ST_INACTIVE; + sdi->vendor = g_strdup(get_brandstr(drv)); + sdi->model = g_strdup(get_typestr(auxtype, drv)); + sdi->version = g_strdup(buf + 9); if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { sr_err("Device context malloc failed."); return NULL;