X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmotech-lps-30x%2Fapi.c;h=0ecfcb09e315e4f35394de42d2d08fbeee729f11;hb=9cfc695ffe5f04622f61acb98ea4ac91c3f4ffc3;hp=1b1eaf17a3243c188d575e7082137add16b0a0b9;hpb=dff0a894356803e238c9ad49c147fbe9aa81c568;p=libsigrok.git

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index 1b1eaf17..0ecfcb09 100644
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -23,6 +23,7 @@
  *  @internal
  */
 
+#include <config.h>
 #include <ctype.h>
 #include <math.h>
 #include <string.h>
@@ -31,10 +32,10 @@
 /* Forward declarations */
 SR_PRIV struct sr_dev_driver motech_lps_301_driver_info;
 SR_PRIV int lps_read_reply(struct sr_serial_dev_inst *serial, char **buf, int *buflen);
-SR_PRIV int lps_send_va(struct sr_serial_dev_inst *serial, const char* fmt, va_list args);
-SR_PRIV int lps_cmd_ok(struct sr_serial_dev_inst *serial, const char* fmt, ...);
-SR_PRIV int lps_cmd_reply(char* reply, struct sr_serial_dev_inst *serial, const char* fmt, ...);
-SR_PRIV int lps_query_status(struct sr_dev_inst* sdi);
+SR_PRIV int lps_send_va(struct sr_serial_dev_inst *serial, const char *fmt, va_list args);
+SR_PRIV int lps_cmd_ok(struct sr_serial_dev_inst *serial, const char *fmt, ...);
+SR_PRIV int lps_cmd_reply(char *reply, struct sr_serial_dev_inst *serial, const char *fmt, ...);
+SR_PRIV int lps_query_status(struct sr_dev_inst *sdi);
 
 /* Serial communication parameters */
 #define SERIALCOMM "2400/8n1/dtr=1/rts=1/flow=0"
@@ -139,7 +140,7 @@ static int init_lps301(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 
 /** Send command to device with va_list.
  */
-SR_PRIV int lps_send_va(struct sr_serial_dev_inst *serial, const char* fmt, va_list args)
+SR_PRIV int lps_send_va(struct sr_serial_dev_inst *serial, const char *fmt, va_list args)
 {
 	int retc;
 	char auxfmt[LINELEN_MAX];
@@ -150,7 +151,8 @@ SR_PRIV int lps_send_va(struct sr_serial_dev_inst *serial, const char* fmt, va_l
 
 	sr_spew("lps_send_va: \"%s\"", buf);
 
-	retc = serial_write_blocking(serial, buf, strlen(buf), 0);
+	retc = serial_write_blocking(serial, buf, strlen(buf),
+			serial_timeout(serial, strlen(buf)));
 
 	if (retc < 0)
 		return SR_ERR;
@@ -160,7 +162,7 @@ SR_PRIV int lps_send_va(struct sr_serial_dev_inst *serial, const char* fmt, va_l
 
 /** Send command to device.
  */
-SR_PRIV int lps_send_req(struct sr_serial_dev_inst *serial, const char* fmt, ...)
+SR_PRIV int lps_send_req(struct sr_serial_dev_inst *serial, const char *fmt, ...)
 {
 	int retc;
 	va_list args;
@@ -173,12 +175,12 @@ SR_PRIV int lps_send_req(struct sr_serial_dev_inst *serial, const char* fmt, ...
 }
 
 /** Send command and consume simple OK reply. */
-SR_PRIV int lps_cmd_ok(struct sr_serial_dev_inst *serial, const char* fmt, ...)
+SR_PRIV int lps_cmd_ok(struct sr_serial_dev_inst *serial, const char *fmt, ...)
 {
 	int retc;
 	va_list args;
 	char buf[LINELEN_MAX];
-	char* bufptr;
+	char *bufptr;
 	int  buflen;
 
 	/* Send command */
@@ -203,12 +205,12 @@ SR_PRIV int lps_cmd_ok(struct sr_serial_dev_inst *serial, const char* fmt, ...)
 /** Send command and read reply string.
  *  @param reply Pointer to buffer of size LINELEN_MAX. Will be NUL-terminated.
  */
-SR_PRIV int lps_cmd_reply(char* reply, struct sr_serial_dev_inst *serial, const char* fmt, ...)
+SR_PRIV int lps_cmd_reply(char *reply, struct sr_serial_dev_inst *serial, const char *fmt, ...)
 {
 	int retc;
 	va_list args;
 	char buf[LINELEN_MAX];
-	char* bufptr;
+	char *bufptr;
 	int  buflen;
 
 	reply[0] = '\0';
@@ -235,12 +237,12 @@ SR_PRIV int lps_cmd_reply(char* reply, struct sr_serial_dev_inst *serial, const
 }
 
 /** Process integer value returned by STATUS command. */
-SR_PRIV int lps_process_status(struct sr_dev_inst* sdi, int stat)
+SR_PRIV int lps_process_status(struct sr_dev_inst *sdi, int stat)
 {
-	struct dev_context* devc;
+	struct dev_context *devc;
 	int tracking_mode;
 
-	devc = (struct dev_context*)sdi->priv;
+	devc = (struct dev_context *)sdi->priv;
 
 	sr_spew("Status: %d", stat);
 	devc->channel_status[0].cc_mode = (stat & 0x01) != 0;
@@ -281,13 +283,13 @@ SR_PRIV int lps_process_status(struct sr_dev_inst* sdi, int stat)
 }
 
 /** Send STATUS commend and process status string. */
-SR_PRIV int lps_query_status(struct sr_dev_inst* sdi)
+SR_PRIV int lps_query_status(struct sr_dev_inst *sdi)
 {
 	char buf[LINELEN_MAX];
 	int stat, ret;
-	struct dev_context* devc;
+	struct dev_context *devc;
 
-	devc = (struct dev_context*)sdi->priv;
+	devc = (struct dev_context *)sdi->priv;
 
 	devc->req_sent_at = g_get_real_time();
 
@@ -520,7 +522,7 @@ static GSList *dev_list_lps301(const struct sr_dev_driver *di)
 	return ((struct drv_context *)(di->context))->instances;
 }
 
-static void dev_clear_private(struct dev_context* devc)
+static void dev_clear_private(struct dev_context *devc)
 {
 	int ch_idx;
 
@@ -794,8 +796,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
-				    void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;