X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fagilent-dmm%2Fsched.c;h=339dbac6aaf11e6a995c276c663d15fafc018cba;hb=61a429c963fb21c3d8cb8e9166d621526724b714;hp=151b8fce54a85e5cab8cec2bf02dd75455f2c4f2;hpb=8c0152f29b7892bb3f131e92c55ecd60a29ece5a;p=libsigrok.git diff --git a/hardware/agilent-dmm/sched.c b/hardware/agilent-dmm/sched.c index 151b8fce..339dbac6 100644 --- a/hardware/agilent-dmm/sched.c +++ b/hardware/agilent-dmm/sched.c @@ -20,14 +20,12 @@ #include #include "libsigrok.h" #include "libsigrok-internal.h" -#include "config.h" #include "agilent-dmm.h" #include #include #include #include - static void dispatch(const struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -40,12 +38,11 @@ static void dispatch(const struct sr_dev_inst *sdi) now = g_get_monotonic_time() / 1000; for (i = 0; (&jobs[i])->interval; i++) { if (now - devc->jobqueue[i] > (&jobs[i])->interval) { - sr_spew("agilent-dmm: running job %d", i); + sr_spew("Running job %d.", i); (&jobs[i])->send(sdi); devc->jobqueue[i] = now; } } - } static void receive_line(const struct sr_dev_inst *sdi) @@ -66,7 +63,7 @@ static void receive_line(const struct sr_dev_inst *sdi) else break; } - sr_spew("agilent-dmm: received '%s'", devc->buf); + sr_spew("Received '%s'.", devc->buf); recv = NULL; recvs = devc->profile->recvs; @@ -84,19 +81,20 @@ static void receive_line(const struct sr_dev_inst *sdi) g_match_info_unref(match); g_regex_unref(reg); } else - sr_dbg("agilent-dmm: unknown line '%s'", devc->buf); + sr_dbg("Unknown line '%s'.", devc->buf); /* Done with this. */ devc->buflen = 0; - } SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data) { - const struct sr_dev_inst *sdi; + struct sr_dev_inst *sdi; struct dev_context *devc; int len; + (void)fd; + if (!(sdi = cb_data)) return TRUE; @@ -106,7 +104,7 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data) if (revents == G_IO_IN) { /* Serial data arrived. */ while(AGDMM_BUFSIZE - devc->buflen - 1 > 0) { - len = serial_read(fd, devc->buf + devc->buflen, 1); + len = serial_read(devc->serial, devc->buf + devc->buflen, 1); if (len < 1) break; devc->buflen += len; @@ -133,14 +131,14 @@ static int agdmm_send(const struct sr_dev_inst *sdi, const char *cmd) char buf[32]; devc = sdi->priv; - sr_spew("agilent-dmm: sending '%s'", cmd); + sr_spew("Sending '%s'.", cmd); strncpy(buf, cmd, 28); if (!strncmp(buf, "*IDN?", 5)) strncat(buf, "\r\n", 32); else strncat(buf, "\n\r\n", 32); - if (serial_write(devc->serial->fd, buf, strlen(buf)) == -1) { - sr_err("agilent-dmm: failed to send: %s", strerror(errno)); + if (serial_write(devc->serial, buf, strlen(buf)) == -1) { + sr_err("Failed to send: %s.", strerror(errno)); return SR_ERR; } @@ -149,7 +147,6 @@ static int agdmm_send(const struct sr_dev_inst *sdi, const char *cmd) static int send_stat(const struct sr_dev_inst *sdi) { - return agdmm_send(sdi, "STAT?"); } @@ -160,7 +157,7 @@ static int recv_stat_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) devc = sdi->priv; s = g_match_info_fetch(match, 1); - sr_spew("agilent-dmm: STAT response '%s'", s); + sr_spew("STAT response '%s'.", s); /* Max, Min or Avg mode -- no way to tell which, so we'll * set both flags to denote it's not a normal measurement. */ @@ -186,7 +183,7 @@ static int recv_stat_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) else devc->mode_tempaux = FALSE; - /* Continuity mode. */ + /* Continuity mode. */ if (s[16] == '1') devc->mode_continuity = TRUE; else @@ -204,7 +201,7 @@ static int recv_stat_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match) devc = sdi->priv; s = g_match_info_fetch(match, 1); - sr_spew("agilent-dmm: STAT response '%s'", s); + sr_spew("STAT response '%s'.", s); /* Peak hold mode. */ if (s[4] == '1') @@ -225,7 +222,6 @@ static int recv_stat_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match) static int send_fetc(const struct sr_dev_inst *sdi) { - return agdmm_send(sdi, "FETC?"); } @@ -237,7 +233,7 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match) float fvalue; char *mstr, *eptr; - sr_spew("agilent-dmm: FETC reply '%s'", g_match_info_get_string(match)); + sr_spew("FETC reply '%s'.", g_match_info_get_string(match)); devc = sdi->priv; if (devc->cur_mq == -1) @@ -247,7 +243,7 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match) return SR_OK; if (!strcmp(g_match_info_get_string(match), "+9.90000000E+37")) { - /* An invalid measurement shows up on the display as "O.L, but + /* An invalid measurement shows up on the display as "O.L", but * comes through like this. Since comparing 38-digit floats * is rather problematic, we'll cut through this here. */ fvalue = NAN; @@ -256,7 +252,7 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match) fvalue = strtof(mstr, &eptr); g_free(mstr); if (fvalue == 0.0 && eptr == mstr) { - sr_err("agilent-dmm: invalid float"); + sr_err("Invalid float."); return SR_ERR; } if (devc->cur_divider > 0) @@ -280,7 +276,6 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match) static int send_conf(const struct sr_dev_inst *sdi) { - return agdmm_send(sdi, "CONF?"); } @@ -289,7 +284,7 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) struct dev_context *devc; char *mstr; - sr_spew("agilent-dmm: CONF? response '%s'", g_match_info_get_string(match)); + sr_spew("CONF? response '%s'.", g_match_info_get_string(match)); devc = sdi->priv; mstr = g_match_info_fetch(match, 1); if (!strcmp(mstr, "V")) { @@ -342,7 +337,7 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) devc->cur_mqflags = 0; devc->cur_divider = 0; } else - sr_dbg("agilent-dmm: unknown first argument"); + sr_dbg("Unknown first argument."); g_free(mstr); if (g_match_info_get_match_count(match) == 4) { @@ -353,7 +348,7 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) else if (!strcmp(mstr, "DC")) devc->cur_mqflags |= SR_MQFLAG_DC; else - sr_dbg("agilent-dmm: unknown third argument"); + sr_dbg("Unknown third argument."); g_free(mstr); } else devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC); @@ -366,7 +361,7 @@ static int recv_conf_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match) struct dev_context *devc; char *mstr; - sr_spew("agilent-dmm: CONF? response '%s'", g_match_info_get_string(match)); + sr_spew("CONF? response '%s'.", g_match_info_get_string(match)); devc = sdi->priv; mstr = g_match_info_fetch(match, 1); if (!strncmp(mstr, "VOLT", 4)) { @@ -399,11 +394,10 @@ static int recv_conf_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match) } devc->cur_mqflags = 0; devc->cur_divider = 0; -} else - sr_dbg("agilent-dmm: unknown first argument"); + } else + sr_dbg("Unknown first argument."); g_free(mstr); - return SR_OK; } @@ -413,7 +407,7 @@ static int recv_conf(const struct sr_dev_inst *sdi, GMatchInfo *match) struct dev_context *devc; char *mstr; - sr_spew("agilent-dmm: CONF? response '%s'", g_match_info_get_string(match)); + sr_spew("CONF? response '%s'.", g_match_info_get_string(match)); devc = sdi->priv; mstr = g_match_info_fetch(match, 1); if(!strcmp(mstr, "DIOD")) { @@ -422,7 +416,7 @@ static int recv_conf(const struct sr_dev_inst *sdi, GMatchInfo *match) devc->cur_mqflags = SR_MQFLAG_DIODE; devc->cur_divider = 0; } else - sr_dbg("agilent-dmm: unknown single argument"); + sr_dbg("Unknown single argument."); g_free(mstr); return SR_OK; @@ -434,15 +428,13 @@ static int recv_conf(const struct sr_dev_inst *sdi, GMatchInfo *match) * we do need to catch this here, or it'll show up in some other output. */ static int recv_switch(const struct sr_dev_inst *sdi, GMatchInfo *match) { - (void)sdi; - sr_spew("agilent-dmm: switch '%s'", g_match_info_get_string(match)); + sr_spew("Switch '%s'.", g_match_info_get_string(match)); return SR_OK; } - SR_PRIV const struct agdmm_job agdmm_jobs_u123x[] = { { 143, send_stat }, { 1000, send_conf }, @@ -476,5 +468,3 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u125x[] = { { "^\"(DIOD)\"$", recv_conf }, { NULL, NULL } }; - -