dev_acquisition_{start,stop}(): Drop duplicate 'cb_data' parameter.

[libsigrok.git] / src / hardware / agilent-dmm / sched.c

diff --git a/src/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c
index 46f4ade210d00f440a4227cf7e0e9753c9247da6..07dbbade1299ae5a4e2d28c196b2b177e9cebf30 100644 (file)
--- a/src/hardware/agilent-dmm/sched.c
+++ b/src/hardware/agilent-dmm/sched.c
@@ -17,14 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "agilent-dmm.h"
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <math.h>
+#include <libsigrok/libsigrok.h>
+#include "libsigrok-internal.h"
+#include "agilent-dmm.h"
 
 static void dispatch(const struct sr_dev_inst *sdi)
 {
@@ -105,7 +105,7 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
        serial = sdi->conn;
        if (revents == G_IO_IN) {
                /* Serial data arrived. */
-               while(AGDMM_BUFSIZE - devc->buflen - 1 > 0) {
+               while (AGDMM_BUFSIZE - devc->buflen - 1 > 0) {
                        len = serial_read_nonblocking(serial, devc->buf + devc->buflen, 1);
                        if (len < 1)
                                break;
@@ -122,7 +122,7 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
        dispatch(sdi);
 
        if (devc->limit_samples && devc->num_samples >= devc->limit_samples)
-               sdi->driver->dev_acquisition_stop(sdi, cb_data);
+               sdi->driver->dev_acquisition_stop(sdi);
 
        return TRUE;
 }
@@ -264,7 +264,7 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
 {
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        float fvalue;
        const char *s;
        char *mstr;
@@ -296,16 +296,16 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
                        fvalue /= devc->cur_divider;
        }
 
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+       memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
        analog.mq = devc->cur_mq;
        analog.unit = devc->cur_unit;
        analog.mqflags = devc->cur_mqflags;
        analog.channels = sdi->channels;
        analog.num_samples = 1;
        analog.data = &fvalue;
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
-       sr_session_send(devc->cb_data, &packet);
+       sr_session_send(sdi, &packet);
 
        devc->num_samples++;
 
@@ -330,11 +330,11 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
                devc->cur_unit = SR_UNIT_VOLT;
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else if(!strcmp(mstr, "MV")) {
+       } else if (!strcmp(mstr, "MV")) {
                if (devc->mode_tempaux) {
                        devc->cur_mq = SR_MQ_TEMPERATURE;
-                       /* No way to detect whether Fahrenheit or Celcius
-                        * is used, so we'll just default to Celcius. */
+                       /* No way to detect whether Fahrenheit or Celsius
+                        * is used, so we'll just default to Celsius. */
                        devc->cur_unit = SR_UNIT_CELSIUS;
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
@@ -344,22 +344,22 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
                        devc->cur_mqflags = 0;
                        devc->cur_divider = 1000;
                }
-       } else if(!strcmp(mstr, "A")) {
+       } else if (!strcmp(mstr, "A")) {
                devc->cur_mq = SR_MQ_CURRENT;
                devc->cur_unit = SR_UNIT_AMPERE;
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else if(!strcmp(mstr, "UA")) {
+       } else if (!strcmp(mstr, "UA")) {
                devc->cur_mq = SR_MQ_CURRENT;
                devc->cur_unit = SR_UNIT_AMPERE;
                devc->cur_mqflags = 0;
                devc->cur_divider = 1000000;
-       } else if(!strcmp(mstr, "FREQ")) {
+       } else if (!strcmp(mstr, "FREQ")) {
                devc->cur_mq = SR_MQ_FREQUENCY;
                devc->cur_unit = SR_UNIT_HERTZ;
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else if(!strcmp(mstr, "RES")) {
+       } else if (!strcmp(mstr, "RES")) {
                if (devc->mode_continuity) {
                        devc->cur_mq = SR_MQ_CONTINUITY;
                        devc->cur_unit = SR_UNIT_BOOLEAN;
@@ -369,7 +369,7 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
                }
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else if(!strcmp(mstr, "CAP")) {
+       } else if (!strcmp(mstr, "CAP")) {
                devc->cur_mq = SR_MQ_CAPACITANCE;
                devc->cur_unit = SR_UNIT_FARAD;
                devc->cur_mqflags = 0;
@@ -423,32 +423,32 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match)
                        }
                } else
                        devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC);
-       } else if(!strcmp(mstr, "CURR")) {
+       } else if (!strcmp(mstr, "CURR")) {
                devc->cur_mq = SR_MQ_CURRENT;
                devc->cur_unit = SR_UNIT_AMPERE;
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else if(!strcmp(mstr, "RES")) {
+       } else if (!strcmp(mstr, "RES")) {
                devc->cur_mq = SR_MQ_RESISTANCE;
                devc->cur_unit = SR_UNIT_OHM;
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else if(!strcmp(mstr, "CAP")) {
+       } else if (!strcmp(mstr, "CAP")) {
                devc->cur_mq = SR_MQ_CAPACITANCE;
                devc->cur_unit = SR_UNIT_FARAD;
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else if(!strcmp(mstr, "FREQ")) {
+       } else if (!strcmp(mstr, "FREQ")) {
                devc->cur_mq = SR_MQ_FREQUENCY;
                devc->cur_unit = SR_UNIT_HERTZ;
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else if(!strcmp(mstr, "CONT")) {
+       } else if (!strcmp(mstr, "CONT")) {
                devc->cur_mq = SR_MQ_CONTINUITY;
                devc->cur_unit = SR_UNIT_BOOLEAN;
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else if(!strncmp(mstr, "T1", 2) || !strncmp(mstr, "T2", 2)) {
+       } else if (!strncmp(mstr, "T1", 2) || !strncmp(mstr, "T2", 2)) {
                devc->cur_mq = SR_MQ_TEMPERATURE;
                m2 = g_match_info_fetch(match, 2);
                if (!strcmp(m2, "FAR"))
@@ -458,13 +458,13 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match)
                g_free(m2);
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else if(!strcmp(mstr, "SCOU")) {
+       } else if (!strcmp(mstr, "SCOU")) {
                /*
                 * Switch counter, not supported. Not sure what values
                 * come from FETC in this mode, or how they would map
                 * into libsigrok.
                 */
-       } else if(!strncmp(mstr, "CPER:", 5)) {
+       } else if (!strncmp(mstr, "CPER:", 5)) {
                devc->cur_mq = SR_MQ_CURRENT;
                devc->cur_unit = SR_UNIT_PERCENTAGE;
                devc->cur_mqflags = 0;
@@ -485,7 +485,7 @@ static int recv_conf(const struct sr_dev_inst *sdi, GMatchInfo *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")) {
+       if (!strcmp(mstr, "DIOD")) {
                devc->cur_mq = SR_MQ_VOLTAGE;
                devc->cur_unit = SR_UNIT_VOLT;
                devc->cur_mqflags = SR_MQFLAG_DIODE;
@@ -515,7 +515,7 @@ SR_PRIV const struct agdmm_job agdmm_jobs_u12xx[] = {
        { 143, send_stat },
        { 1000, send_conf },
        { 143, send_fetc },
-       { 0, NULL }
+       ALL_ZERO
 };
 
 SR_PRIV const struct agdmm_recv agdmm_recvs_u123x[] = {
@@ -525,7 +525,7 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u123x[] = {
        { "^\"(V|MV|A|UA|FREQ),(\\d),(AC|DC)\"$", recv_conf_u123x },
        { "^\"(RES|CAP),(\\d)\"$", recv_conf_u123x},
        { "^\"(DIOD)\"$", recv_conf },
-       { NULL, NULL }
+       ALL_ZERO
 };
 
 SR_PRIV const struct agdmm_recv agdmm_recvs_u124x[] = {
@@ -537,7 +537,7 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u124x[] = {
        { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x },
        { "^\"(T[0-9]:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x },
        { "^\"(DIOD)\"$", recv_conf },
-       { NULL, NULL }
+       ALL_ZERO
 };
 
 SR_PRIV const struct agdmm_recv agdmm_recvs_u125x[] = {
@@ -549,5 +549,5 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u125x[] = {
        { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x },
        { "^\"(T[0-9]:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x },
        { "^\"(DIOD)\"$", recv_conf },
-       { NULL, NULL }
+       ALL_ZERO
 };