X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffluke-dmm%2Fapi.c;h=78b63a8658fd280ab3c1f3063ee432fd5118aca6;hb=7a36037546aaf11b91ff5d63fbd571e15407e357;hp=d6c322accdc9416a0ccc3e214d5d8dc31cc7ec48;hpb=545f9786390a89b8bb6868907afa555fc0a6ece4;p=libsigrok.git diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c index d6c322ac..78b63a86 100644 --- a/hardware/fluke-dmm/api.c +++ b/hardware/fluke-dmm/api.c @@ -18,14 +18,14 @@ */ #include -#include "libsigrok.h" -#include "libsigrok-internal.h" -#include "fluke-dmm.h" #include #include #include #include #include +#include "libsigrok.h" +#include "libsigrok-internal.h" +#include "fluke-dmm.h" static const int hwopts[] = { SR_HWOPT_CONN, @@ -86,8 +86,8 @@ static int hw_init(void) struct drv_context *drvc; if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("fluke-dmm: driver context malloc failed."); - return SR_ERR; + sr_err("Driver context malloc failed."); + return SR_ERR_MALLOC; } di->priv = drvc; @@ -95,40 +95,6 @@ static int hw_init(void) return SR_OK; } -static int serial_readline(int fd, char **buf, int *buflen, uint64_t timeout_ms) -{ - uint64_t start; - int maxlen, len; - - timeout_ms *= 1000; - start = g_get_monotonic_time(); - - maxlen = *buflen; - *buflen = len = 0; - while(1) { - len = maxlen - *buflen - 1; - if (len < 1) - break; - len = serial_read(fd, *buf + *buflen, 1); - if (len > 0) { - *buflen += len; - *(*buf + *buflen) = '\0'; - if (*buflen > 0 && *(*buf + *buflen - 1) == '\r') { - /* Strip LF and terminate. */ - *(*buf + --*buflen) = '\0'; - break; - } - } - if (g_get_monotonic_time() - start > timeout_ms) - /* Timeout */ - break; - g_usleep(2000); - } - sr_dbg("fluke-dmm: received %d: '%s'", *buflen, *buf); - - return SR_OK; -} - static GSList *fluke_scan(const char *conn, const char *serialcomm) { struct sr_dev_inst *sdi; @@ -140,11 +106,11 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm) char buf[128], *b, **tokens; if ((fd = serial_open(conn, O_RDWR|O_NONBLOCK)) == -1) { - sr_err("fluke-dmm: unable to open %s: %s", conn, strerror(errno)); + sr_err("Unable to open %s: %s.", conn, strerror(errno)); return NULL; } if (serial_set_paramstr(fd, serialcomm) != SR_OK) { - sr_err("fluke-dmm: unable to set serial parameters"); + sr_err("Unable to set serial parameters."); return NULL; } @@ -158,8 +124,8 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm) retry++; serial_flush(fd); if (serial_write(fd, "ID\r", 3) == -1) { - sr_err("fluke-dmm: unable to send ID string: %s", - strerror(errno)); + sr_err("Unable to send ID string: %s.", + strerror(errno)); continue; } @@ -189,7 +155,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm) tokens[0] + 6, tokens[1] + s))) return NULL; if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { - sr_dbg("fluke-dmm: failed to malloc devc"); + sr_err("Device context malloc failed."); return NULL; } devc->profile = &supported_flukedmm[i]; @@ -261,18 +227,17 @@ static int hw_dev_open(struct sr_dev_inst *sdi) struct dev_context *devc; if (!(devc = sdi->priv)) { - sr_err("fluke-dmm: sdi->priv was NULL."); + sr_err("sdi->priv was NULL."); return SR_ERR_BUG; } devc->serial->fd = serial_open(devc->serial->port, O_RDWR | O_NONBLOCK); if (devc->serial->fd == -1) { - sr_err("fluke-dmm: Couldn't open serial port '%s'.", - devc->serial->port); + sr_err("Couldn't open serial port '%s'.", devc->serial->port); return SR_ERR; } if (serial_set_paramstr(devc->serial->fd, devc->serialcomm) != SR_OK) { - sr_err("fluke-dmm: unable to set serial parameters"); + sr_err("Unable to set serial parameters."); return SR_ERR; } sdi->status = SR_ST_ACTIVE; @@ -285,7 +250,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi) struct dev_context *devc; if (!(devc = sdi->priv)) { - sr_err("fluke-dmm: sdi->priv was NULL."); + sr_err("sdi->priv was NULL."); return SR_ERR_BUG; } @@ -341,7 +306,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, return SR_ERR; if (!(devc = sdi->priv)) { - sr_err("fluke-dmm: sdi->priv was NULL."); + sr_err("sdi->priv was NULL."); return SR_ERR_BUG; } @@ -349,20 +314,20 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, case SR_HWCAP_LIMIT_MSEC: /* TODO: not yet implemented */ if (*(const uint64_t *)value == 0) { - sr_err("fluke-dmm: LIMIT_MSEC can't be 0."); + sr_err("LIMIT_MSEC can't be 0."); return SR_ERR; } devc->limit_msec = *(const uint64_t *)value; - sr_dbg("fluke-dmm: Setting time limit to %" PRIu64 "ms.", + sr_dbg("Setting time limit to %" PRIu64 "ms.", devc->limit_msec); break; case SR_HWCAP_LIMIT_SAMPLES: devc->limit_samples = *(const uint64_t *)value; - sr_dbg("fluke-dmm: Setting sample limit to %" PRIu64 ".", + sr_dbg("Setting sample limit to %" PRIu64 ".", devc->limit_samples); break; default: - sr_err("fluke-dmm: Unknown capability: %d.", hwcap); + sr_err("Unknown capability: %d.", hwcap); return SR_ERR; break; } @@ -379,16 +344,16 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, struct dev_context *devc; if (!(devc = sdi->priv)) { - sr_err("fluke-dmm: sdi->priv was NULL."); + sr_err("sdi->priv was NULL."); return SR_ERR_BUG; } - sr_dbg("fluke-dmm: Starting acquisition."); + sr_dbg("Starting acquisition."); devc->cb_data = cb_data; /* Send header packet to the session bus. */ - sr_dbg("fluke-dmm: Sending SR_DF_HEADER."); + sr_dbg("Sending SR_DF_HEADER."); packet.type = SR_DF_HEADER; packet.payload = (uint8_t *)&header; header.feed_version = 1; @@ -396,7 +361,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, sr_session_send(devc->cb_data, &packet); /* Send metadata about the SR_DF_ANALOG packets to come. */ - sr_dbg("fluke-dmm: Sending SR_DF_META_ANALOG."); + sr_dbg("Sending SR_DF_META_ANALOG."); packet.type = SR_DF_META_ANALOG; packet.payload = &meta; meta.num_probes = 1; @@ -406,7 +371,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, sr_source_add(devc->serial->fd, G_IO_IN, 50, fluke_receive_data, (void *)sdi); if (serial_write(devc->serial->fd, "QM\r", 3) == -1) { - sr_err("fluke-dmm: unable to send QM: %s", strerror(errno)); + sr_err("Unable to send QM: %s.", strerror(errno)); return SR_ERR; } devc->cmd_sent_at = g_get_monotonic_time() / 1000; @@ -415,8 +380,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_OK; } -static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, - void *cb_data) +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { struct sr_datafeed_packet packet; struct dev_context *devc; @@ -425,17 +389,17 @@ static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, return SR_ERR; if (!(devc = sdi->priv)) { - sr_err("fluke-dmm: sdi->priv was NULL."); + sr_err("sdi->priv was NULL."); return SR_ERR_BUG; } - sr_dbg("fluke-dmm: Stopping acquisition."); + sr_dbg("Stopping acquisition."); sr_source_remove(devc->serial->fd); hw_dev_close((struct sr_dev_inst *)sdi); /* Send end packet to the session bus. */ - sr_dbg("fluke-dmm: Sending SR_DF_END."); + sr_dbg("Sending SR_DF_END."); packet.type = SR_DF_END; sr_session_send(cb_data, &packet);