Match std_init() parameter order to the driver init() callback

[libsigrok.git] / src / hardware / uni-t-dmm / protocol.h

diff --git a/src/hardware/uni-t-dmm/protocol.h b/src/hardware/uni-t-dmm/protocol.h
index 3e063664839a89fdab8ad2454b3f3b744640bff4..9ec354fb7d5a0dd8d153699cf546bdf8225dcf87 100644 (file)
--- a/src/hardware/uni-t-dmm/protocol.h
+++ b/src/hardware/uni-t-dmm/protocol.h
@@ -24,21 +24,21 @@
 #include <stdint.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "uni-t-dmm"
 
 struct dmm_info {
        struct sr_dev_driver di;
-       char *vendor;
-       char *device;
+       const char *vendor;
+       const char *device;
        uint32_t baudrate;
        int packet_size;
        gboolean (*packet_valid)(const uint8_t *);
        int (*packet_parse)(const uint8_t *, float *,
-                           struct sr_datafeed_analog *, void *);
-       void (*dmm_details)(struct sr_datafeed_analog *, void *);
+                           struct sr_datafeed_analog_old *, void *);
+       void (*dmm_details)(struct sr_datafeed_analog_old *, void *);
        gsize info_size;
 };
 
@@ -48,19 +48,7 @@ struct dmm_info {
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
-       /** The current sampling limit (in number of samples). */
-       uint64_t limit_samples;
-
-       /** The current sampling limit (in ms). */
-       uint64_t limit_msec;
-
-       /** Opaque pointer passed in by the frontend. */
-       void *cb_data;
-
-       /** The current number of already received samples. */
-       uint64_t num_samples;
-
-       int64_t starttime;
+       struct sr_sw_limits limits;
 
        gboolean first_run;