X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmanson-hcs-3xxx%2Fprotocol.c;h=657ae318895252abf2dc37cacf58312f27fe04ac;hb=803db07a1af036a5da65581ddbac23b7f84a4388;hp=ad31d429b284f959ccc4b6c0b34520b0e4afa73c;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git diff --git a/src/hardware/manson-hcs-3xxx/protocol.c b/src/hardware/manson-hcs-3xxx/protocol.c index ad31d429..657ae318 100644 --- a/src/hardware/manson-hcs-3xxx/protocol.c +++ b/src/hardware/manson-hcs-3xxx/protocol.c @@ -44,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; } @@ -122,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;