X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=f95e7398701c3e9e6923f804f1753f55a48a2fe6;hb=9c6a2913fdf11857774418b18665f8f684762a31;hp=deefceaebac6f9623281733ad0d388314a1911a2;hpb=8849f45ad71585e8eb3090733c911f6f15cc2a3f;p=libsigrok.git diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c index deefceae..f95e7398 100644 --- a/src/hardware/norma-dmm/api.c +++ b/src/hardware/norma-dmm/api.c @@ -115,7 +115,7 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options) if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) return NULL; - if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; serial_flush(serial); @@ -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,7 +144,7 @@ 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, + if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, get_brandstr(drv), get_typestr(auxtype, drv), buf + 9))) return NULL; if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {