X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=ab9b36e292d047feb3713e1658c7dcae8ee96c0b;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=c5f95d28e020526f62d5d5e5e00b9272a068267f;hpb=5827f61b641cfd326a9cf2ea534eb4f9481a8187;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index c5f95d28..ab9b36e2 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,9 +129,8 @@ 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(serial, req, strlen(req)) == -1) {
-			sr_err("Unable to send identification request: %d %s.",
-			       errno, strerror(errno));
+		if (serial_write_blocking(serial, req, strlen(req), 0) < 0) {
+			sr_err("Unable to send identification request.");
 			return NULL;
 		}
 		len = BUF_MAX;
@@ -145,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;