X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmotech-lps-30x%2Fapi.c;h=693f6e4a85baff11fe1a03e2d3c268e6700d0b0a;hb=700d6b64d578ce10e57f6a2289e37a5564eccf1c;hp=19f530de1c9a31d7b26e32ef7b1f6dd7d7ef15e6;hpb=41812aca436805b0614f2a8f31cf2f8ce494aea0;p=libsigrok.git diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c index 19f530de..693f6e4a 100644 --- a/src/hardware/motech-lps-30x/api.c +++ b/src/hardware/motech-lps-30x/api.c @@ -23,8 +23,8 @@ * @internal */ +#include #include -#include #include #include #include "protocol.h" @@ -32,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" @@ -140,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]; @@ -151,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; @@ -161,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; @@ -174,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 */ @@ -202,14 +203,14 @@ 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. + * @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'; @@ -236,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 = sdi->priv; sr_spew("Status: %d", stat); devc->channel_status[0].cc_mode = (stat & 0x01) != 0; @@ -282,18 +283,19 @@ 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; - struct dev_context* devc; + int stat, ret; + struct dev_context *devc; - devc = (struct dev_context*)sdi->priv; + devc = sdi->priv; devc->req_sent_at = g_get_real_time(); - if (lps_cmd_reply(buf, sdi->conn, "STATUS") < 0) { - sr_err("%s: Failed to read status: %d %s", __func__, errno, strerror(errno)); + if ((ret = lps_cmd_reply(buf, sdi->conn, "STATUS")) < 0) { + sr_err("%s: Failed to read status: %s.", __func__, + sr_strerror(ret)); return SR_ERR; } @@ -314,8 +316,8 @@ static gint64 calc_timeout_ms(gint64 start_us) } /** Read message into buf until "OK" received. - * \retval SR_OK Msg received; buf and buflen contain result, if any except OK. - * \retval SR_ERR Error, including timeout. + * @retval SR_OK Msg received; buf and buflen contain result, if any except OK. + * @retval SR_ERR Error, including timeout. */ SR_PRIV int lps_read_reply(struct sr_serial_dev_inst *serial, char **buf, int *buflen) { @@ -379,7 +381,7 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o struct sr_channel_group *cg; GSList *devices; const char *conn, *serialcomm; - int cnt; + int cnt, ret; gchar buf[LINELEN_MAX]; gchar channel[10]; char *verstr; @@ -389,7 +391,7 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o conn = serialcomm = NULL; devices = NULL; - drvc = drv->priv; + drvc = drv->context; drvc->instances = NULL; sr_spew("scan() called!"); @@ -434,7 +436,7 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o /* Query version */ verstr = NULL; - if (lps_cmd_reply(buf, serial, "VERSION") == SR_OK) { + if ((ret = lps_cmd_reply(buf, serial, "VERSION")) == SR_OK) { if (strncmp(buf, "Ver-", 4)) { sr_spew("Version string %s not recognized.", buf); goto exit_err; @@ -445,7 +447,8 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o } else /* Bug in device FW 1.17: Querying version string fails while output is active. Therefore just print an error message, but do not exit with error. */ - sr_err("Failed to query for hardware version: %d %s", errno, strerror(errno)); + sr_err("Failed to query for hardware version: %s.", + sr_strerror(ret)); sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_INACTIVE; @@ -519,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; @@ -535,11 +538,6 @@ static int dev_clear_lps301(const struct sr_dev_driver *di) return std_dev_clear(di, (std_dev_clear_callback)dev_clear_private); } -static int cleanup(const struct sr_dev_driver *di) -{ - return dev_clear_lps301(di); -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -793,8 +791,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) { struct dev_context *devc; struct sr_serial_dev_inst *serial; @@ -809,7 +806,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, serial = sdi->conn; serial_source_add(sdi->session, serial, G_IO_IN, 50, motech_lps_30x_receive_data, (void *)sdi); - std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi, LOG_PREFIX); /* Start timer, if required. */ if (devc->limit_msec) @@ -821,7 +818,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -829,7 +826,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) if (sdi && (devc = sdi->priv) && devc->limit_msec) g_timer_stop(devc->elapsed_msec); - return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close, + return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close, sdi->conn, LOG_PREFIX); } @@ -838,7 +835,7 @@ SR_PRIV struct sr_dev_driver motech_lps_301_driver_info = { .longname = "Motech LPS-301", .api_version = 1, .init = init_lps301, - .cleanup = cleanup, + .cleanup = std_cleanup, .scan = scan_lps301, .dev_list = dev_list_lps301, .dev_clear = dev_clear_lps301,