serial: use timeout API in stream detect, obsoletes bitrate param

[libsigrok.git] / src / hardware / kern-scale / api.c

diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c
index dea9c35291ccbf2b202ceb5fc46df9b675ebd74a..fba3e4a50d155e7e5156d7f50de606938147eeaa 100644 (file)
--- 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. */