tondaj-sl-814: Convert to SR_DF_ANALOG.

[libsigrok.git] / src / hardware / manson-hcs-3xxx / protocol.c

diff --git a/src/hardware/manson-hcs-3xxx/protocol.c b/src/hardware/manson-hcs-3xxx/protocol.c
index a57c92d988149c7f04e729327d2c40431f72f387..1037782cade02e2393e123b060aa6cf81bea2e09 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/protocol.c
+++ b/src/hardware/manson-hcs-3xxx/protocol.c
@@ -24,6 +24,7 @@
   *  @internal
   */
 
+#include <config.h>
 #include "protocol.h"
 
 #define REQ_TIMEOUT_MS 500
@@ -43,7 +44,8 @@ SR_PRIV int hcs_send_cmd(struct sr_serial_dev_inst *serial, const char *cmd, ...
        sr_dbg("Sending '%s'.", cmd_esc);
        g_free(cmd_esc);
 
-       if ((ret = serial_write_blocking(serial, cmdbuf, strlen(cmdbuf))) < 0) {
+       if ((ret = serial_write_blocking(serial, cmdbuf, strlen(cmdbuf),
+                       serial_timeout(serial, strlen(cmdbuf)))) < 0) {
                sr_err("Error sending command: %d.", ret);
                return ret;
        }
@@ -62,7 +64,7 @@ SR_PRIV int hcs_send_cmd(struct sr_serial_dev_inst *serial, const char *cmd, ...
  * @retval SR_ERR Error.
  * @retval SR_ERR_ARG Invalid argument.
  */
-SR_PRIV int hcs_read_reply(struct sr_serial_dev_inst *serial, int lines, char* buf, int buflen)
+SR_PRIV int hcs_read_reply(struct sr_serial_dev_inst *serial, int lines, char *buf, int buflen)
 {
        int l_recv = 0;
        int bufpos = 0;
@@ -72,7 +74,7 @@ SR_PRIV int hcs_read_reply(struct sr_serial_dev_inst *serial, int lines, char* b
                return SR_ERR_ARG;
 
        while ((l_recv < lines) && (bufpos < (buflen + 1))) {
-               retc = serial_read_blocking(serial, &buf[bufpos], 1);
+               retc = serial_read_blocking(serial, &buf[bufpos], 1, 0);
                if (retc != 1)
                        return SR_ERR;
                if (buf[bufpos] == '\r')
@@ -121,11 +123,11 @@ static void send_sample(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
 
        devc = sdi->priv;
 
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
        analog.channels = sdi->channels;
        analog.num_samples = 1;
@@ -142,7 +144,8 @@ static void send_sample(struct sr_dev_inst *sdi)
        analog.data = &devc->current;
        sr_session_send(sdi, &packet);
 
-       devc->num_samples++;
+
+       sr_sw_limits_update_samples_read(&devc->limits, 1);
 }
 
 static int parse_reply(struct sr_dev_inst *sdi)
@@ -177,7 +180,7 @@ static int handle_new_data(struct sr_dev_inst *sdi)
        devc = sdi->priv;
        serial = sdi->conn;
 
-       len = serial_read_blocking(serial, devc->buf + devc->buflen, 1);
+       len = serial_read_blocking(serial, devc->buf + devc->buflen, 1, 0);
        if (len < 1)
                return SR_ERR;
 
@@ -204,7 +207,7 @@ SR_PRIV int hcs_receive_data(int fd, int revents, void *cb_data)
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
-       int64_t t, elapsed_us;
+       uint64_t elapsed_us;
 
        (void)fd;
 
@@ -223,21 +226,11 @@ SR_PRIV int hcs_receive_data(int fd, int revents, void *cb_data)
                /* Timeout. */
        }
 
-       if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
-               sr_info("Requested number of samples reached.");
-               sdi->driver->dev_acquisition_stop(sdi, cb_data);
+       if (sr_sw_limits_check(&devc->limits)) {
+               sdi->driver->dev_acquisition_stop(sdi);
                return TRUE;
        }
 
-       if (devc->limit_msec) {
-               t = (g_get_monotonic_time() - devc->starttime) / 1000;
-               if (t > (int64_t)devc->limit_msec) {
-                       sr_info("Requested time limit reached.");
-                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
-                       return TRUE;
-               }
-       }
-
        /* Request next packet, if required. */
        if (sdi->status == SR_ST_ACTIVE) {
                if (devc->reply_pending) {