X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fprotocol.h;h=9ec354fb7d5a0dd8d153699cf546bdf8225dcf87;hb=f1e93a951ec455ec5576ef17c0853b38be242b0b;hp=02810b727af5239b1517524b8dce3dc4ea0128af;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git diff --git a/src/hardware/uni-t-dmm/protocol.h b/src/hardware/uni-t-dmm/protocol.h index 02810b72..9ec354fb 100644 --- a/src/hardware/uni-t-dmm/protocol.h +++ b/src/hardware/uni-t-dmm/protocol.h @@ -31,14 +31,14 @@ 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;