X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkern-scale%2Fapi.c;h=70e85a0775f0898f00697599d257334c5490063d;hb=8b607a24e7e7dec8b65963281b9cb43a0c5ba0a6;hp=dea9c35291ccbf2b202ceb5fc46df9b675ebd74a;hpb=dd7a72ea697a172032f5473b0ddff5e8d47222f4;p=libsigrok.git

diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c
index dea9c352..70e85a07 100644
--- a/src/hardware/kern-scale/api.c
+++ b/src/hardware/kern-scale/api.c
@@ -82,14 +82,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	serial_flush(serial);
 
 	sr_spew("Set O1 mode (continuous values, stable and unstable ones).");
-	if (serial_write_nonblocking(serial, "O1\r\n", 4) != 4)
+	if (serial_write_blocking(serial, "O1\r\n", 4, 0) < 0)
 		goto scan_cleanup;
 	/* Device replies with "A00\r\n" (OK) or "E01\r\n" (Error). Ignore. */
 
 	/* Let's get a bit of data and see if we can find a packet. */
 	len = sizeof(buf);
 	ret = serial_stream_detect(serial, buf, &len, scale->packet_size,
-				   scale->packet_valid, 3000, scale->baudrate);
+				   scale->packet_valid, 3000);
 	if (ret != SR_OK)
 		goto scan_cleanup;
 
@@ -140,7 +140,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	serial = sdi->conn;
 
 	sr_spew("Set O1 mode (continuous values, stable and unstable ones).");
-	if (serial_write_nonblocking(serial, "O1\r\n", 4) != 4)
+	if (serial_write_blocking(serial, "O1\r\n", 4, 0) < 0)
 		return SR_ERR;
 	/* Device replies with "A00\r\n" (OK) or "E01\r\n" (Error). Ignore. */
 
@@ -153,7 +153,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-#define SCALE(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \
+#define SCALE(ID, CHIPSET, VENDOR, MODEL, CONN, PACKETSIZE, \
 			VALID, PARSE) \
 	&((struct scale_info) { \
 		{ \
@@ -174,7 +174,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 			.dev_acquisition_stop = std_serial_dev_acquisition_stop, \
 			.context = NULL, \
 		}, \
-		VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \
+		VENDOR, MODEL, CONN, PACKETSIZE, \
 		VALID, PARSE, sizeof(struct CHIPSET##_info) \
 	}).di
 
@@ -191,7 +191,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 SR_REGISTER_DEV_DRIVER_LIST(kern_scale_drivers,
 	SCALE(
 		"kern-ew-6200-2nm", kern,
-		"KERN", "EW 6200-2NM", "1200/8n2", 1200,
+		"KERN", "EW 6200-2NM", "1200/8n2",
 		15 /* (or 14) */, sr_kern_packet_valid, sr_kern_parse
 	)
 );