X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=174425b709e4087d9e2aaf9352d21c69f2cd1144;hb=98bfc4741f76b07e7db4c9628a6924004fc4fff4;hp=93c9a79d853bcf75ac16cab4bd9b75832529c20e;hpb=aed4ad0beaf64062752039a13f9a95326aa1df87;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index 93c9a79d..174425b7 100644
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -82,7 +82,6 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_config *src;
-	struct sr_channel *ch;
 	struct sr_serial_dev_inst *serial;
 	GSList *l, *devices;
 	int len, cnt;
@@ -112,8 +111,7 @@ static GSList *do_scan(struct sr_dev_driver* drv, GSList *options)
 	if (!serialcomm)
 		serialcomm = SERIALCOMM;
 
-	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-		return NULL;
+	serial = sr_serial_dev_inst_new(conn, serialcomm);
 
 	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
@@ -129,7 +127,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,24 +142,19 @@ 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(SR_ST_INACTIVE,
-						get_brandstr(drv), get_typestr(auxtype, drv), buf + 9)))
-				return NULL;
-			if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-				sr_err("Device context malloc failed.");
-				return NULL;
-			}
+			sdi = g_malloc0(sizeof(struct sr_dev_inst));
+			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);
+			devc = g_malloc0(sizeof(struct dev_context));
 			devc->type = auxtype;
 			devc->version = g_strdup(&buf[9]);
 			devc->elapsed_msec = g_timer_new();
-
 			sdi->conn = serial;
 			sdi->priv = devc;
 			sdi->driver = drv;
-			if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE,
-				"P1")))
-				return NULL;
-			sdi->channels = g_slist_append(sdi->channels, ch);
+			sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
 			drvc->instances = g_slist_append(drvc->instances, sdi);
 			devices = g_slist_append(devices, sdi);
 			break;