X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmanson-hcs-3xxx%2Fprotocol.c;h=657ae318895252abf2dc37cacf58312f27fe04ac;hb=6e68da5140e80443bbb122f0c23ae5a17d91c697;hp=cb333149c87444ad1d73d7fe40341af3d354b504;hpb=eead2782427ee5da9b793527f9484ac827a7bec5;p=libsigrok.git

diff --git a/src/hardware/manson-hcs-3xxx/protocol.c b/src/hardware/manson-hcs-3xxx/protocol.c
index cb333149..657ae318 100644
--- 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;
 	}
@@ -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;
@@ -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;