SR_DF_ANALOG_OLD and sr_datafeed_analog_old renames.

[libsigrok.git] / src / hardware / gmc-mh-1x-2x / protocol.c

diff --git a/src/hardware/gmc-mh-1x-2x/protocol.c b/src/hardware/gmc-mh-1x-2x/protocol.c
index f544c2719cb647c048cd3faddb5c49844bcb3c00..7851f0ecb443f9c0c005e4da73b33391d794376c 100644 (file)
--- a/src/hardware/gmc-mh-1x-2x/protocol.c
+++ b/src/hardware/gmc-mh-1x-2x/protocol.c
@@ -652,12 +652,12 @@ static void clean_ctmv_rs_v(struct dev_context *devc)
 static void send_value(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct sr_datafeed_packet packet;
 
        devc = sdi->priv;
 
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+       memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
        analog.channels = sdi->channels;
        analog.num_samples = 1;
        analog.mq = devc->mq;
@@ -666,7 +666,7 @@ static void send_value(struct sr_dev_inst *sdi)
        analog.data = &devc->value;
 
        memset(&packet, 0, sizeof(struct sr_datafeed_packet));
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
        sr_session_send(devc->cb_data, &packet);
 
@@ -938,7 +938,6 @@ static int chk_msg14(struct sr_dev_inst *sdi)
        }
 
        if (devc->buf[1] == 0) { /* Error msg from device! */
-               retc = SR_ERR_ARG;
                switch (devc->buf[2]) {
                case 1: /* Not used */
                        sr_err("Device: Illegal error code!");
@@ -1312,7 +1311,8 @@ int req_meas14(const struct sr_dev_inst *sdi)
        devc->cmd_idx = 0;
        create_cmd_14(devc->addr, 8, params, msg);
        devc->req_sent_at = g_get_monotonic_time();
-       if (serial_write_blocking(serial, msg, sizeof(msg), 0) < (int)sizeof(msg)) {
+       if (serial_write_blocking(serial, msg, sizeof(msg),
+                       serial_timeout(serial, sizeof(msg))) < (int)sizeof(msg)) {
                return SR_ERR;
        }
 
@@ -1341,13 +1341,16 @@ int req_stat14(const struct sr_dev_inst *sdi, gboolean power_on)
 
        if (power_on) {
                sr_info("Write some data and wait 3s to turn on powered off device...");
-               if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0)
+               if (serial_write_blocking(serial, msg, sizeof(msg),
+                               serial_timeout(serial, sizeof(msg))) < 0)
                        return SR_ERR;
                g_usleep(1 * 1000 * 1000);
-               if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0)
+               if (serial_write_blocking(serial, msg, sizeof(msg),
+                               serial_timeout(serial, sizeof(msg))) < 0)
                        return SR_ERR;
                g_usleep(1 * 1000 * 1000);
-               if (serial_write_blocking(serial, msg, sizeof(msg), 0) < 0)
+               if (serial_write_blocking(serial, msg, sizeof(msg),
+                               serial_timeout(serial, sizeof(msg))) < 0)
                        return SR_ERR;
                g_usleep(1 * 1000 * 1000);
                serial_flush(serial);
@@ -1355,7 +1358,8 @@ int req_stat14(const struct sr_dev_inst *sdi, gboolean power_on)
 
        /* Write message and wait for reply */
        devc->req_sent_at = g_get_monotonic_time();
-       if (serial_write_blocking(serial, msg, sizeof(msg), 0) < (int)sizeof(msg)) {
+       if (serial_write_blocking(serial, msg, sizeof(msg),
+                       serial_timeout(serial, sizeof(msg))) < (int)sizeof(msg)) {
                return SR_ERR;
        }
 
@@ -1532,7 +1536,8 @@ SR_PRIV int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *s
                params[0] = 5;
                params[1] = 5;
                create_cmd_14(devc->addr, 6, params, msg);
-               if (serial_write_blocking(sdi->conn, msg, sizeof(msg), 0) < 0)
+               if (serial_write_blocking(sdi->conn, msg, sizeof(msg),
+                               serial_timeout(sdi->conn, sizeof(msg))) < 0)
                        return SR_ERR;
                else
                        g_usleep(2 * 1000 * 1000); /* Wait to ensure transfer before interface switched off. */