X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-dmm%2Ffluke-dmm.h;h=a54c7ef05e95f2dbf4c2f4b929da36c13f013233;hb=6cf1a87bfb803e088234e2e313891d27379880cf;hp=823f1624940ab3c5541a25b24a1fe78e957bd3b5;hpb=ba4dfbde11f48ce4bccda265f3db1e82901df99c;p=libsigrok.git diff --git a/src/hardware/fluke-dmm/fluke-dmm.h b/src/hardware/fluke-dmm/fluke-dmm.h index 823f1624..a54c7ef0 100644 --- a/src/hardware/fluke-dmm/fluke-dmm.h +++ b/src/hardware/fluke-dmm/fluke-dmm.h @@ -22,7 +22,7 @@ #define LOG_PREFIX "fluke-dmm" -#define FLUKEDMM_BUFSIZE 256 +#define FLUKEDMM_BUFSIZE 256 /* Always USB-serial, 1ms is plenty. */ #define SERIAL_WRITE_TIMEOUT_MS 1 @@ -49,23 +49,18 @@ struct flukedmm_profile { /* Private, per-device-instance driver context. */ struct dev_context { const struct flukedmm_profile *profile; - uint64_t limit_samples; - uint64_t limit_msec; - - /* Opaque pointer passed in by the frontend. */ - void *cb_data; + struct sr_sw_limits limits; /* Runtime. */ - uint64_t num_samples; char buf[FLUKEDMM_BUFSIZE]; int buflen; int64_t cmd_sent_at; int expect_response; int meas_type; int is_relative; - int mq; - int unit; - int mqflags; + enum sr_mq mq; + enum sr_unit unit; + enum sr_mqflag mqflags; }; SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data);