SR_DF_ANALOG_OLD and sr_datafeed_analog_old renames.

[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 2dc09dcdfbf9327c662c094ec02ad00f368b489d..657ae318895252abf2dc37cacf58312f27fe04ac 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)) < 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;
        }
@@ -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;