X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-dmm%2Fapi.c;h=b7638fa2b18b6f355590489dcefcf2cd978fc755;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=74d477cb95f2505cb8056f2868d69463dca8ecff;hpb=50276118ca45dc3dbf91f2fc77fc1f611cf1e57d;p=libsigrok.git

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 74d477cb..b7638fa2 100644
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -90,7 +90,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 	while (!devices && retry < 3) {
 		retry++;
 		serial_flush(serial);
-		if (serial_write_blocking(serial, "ID\r", 3) < 0) {
+		if (serial_write_blocking(serial, "ID\r", 3, SERIAL_WRITE_TIMEOUT_MS) < 0) {
 			sr_err("Unable to send ID string");
 			continue;
 		}
@@ -122,9 +122,11 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 					continue;
 				/* Skip leading spaces in version number. */
 				for (s = 0; tokens[1][s] == ' '; s++);
-				if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Fluke",
-						tokens[0] + 6, tokens[1] + s)))
-					return NULL;
+				sdi = sr_dev_inst_new();
+				sdi->status = SR_ST_INACTIVE;
+				sdi->vendor = g_strdup("Fluke");
+				sdi->model = g_strdup(tokens[0] + 6);
+				sdi->version = g_strdup(tokens[1] + s);
 				if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
 					sr_err("Device context malloc failed.");
 					return NULL;
@@ -176,6 +178,7 @@ static GSList *scan(GSList *options)
 	if (!conn)
 		return NULL;
 
+	devices = NULL;
 	if (serialcomm) {
 		/* Use the provided comm specs. */
 		devices = fluke_scan(conn, serialcomm);
@@ -285,7 +288,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	serial_source_add(sdi->session, serial, G_IO_IN, 50,
 			fluke_receive_data, (void *)sdi);
 
-	if (serial_write_blocking(serial, "QM\r", 3) < 0) {
+	if (serial_write_blocking(serial, "QM\r", 3, SERIAL_WRITE_TIMEOUT_MS) < 0) {
 		sr_err("Unable to send QM.");
 		return SR_ERR;
 	}