X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fprotocol.h;h=562cf74738cf113c693ead8464bc8aefa86c2a1e;hb=cb4b368f17f03d03075a25b2eee1045023b973b3;hp=853809e36c0c5849c89736d8cb12ad9f0bc6c781;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;p=libsigrok.git diff --git a/src/hardware/uni-t-dmm/protocol.h b/src/hardware/uni-t-dmm/protocol.h index 853809e3..562cf747 100644 --- a/src/hardware/uni-t-dmm/protocol.h +++ b/src/hardware/uni-t-dmm/protocol.h @@ -37,8 +37,8 @@ struct dmm_info { int packet_size; gboolean (*packet_valid)(const uint8_t *); int (*packet_parse)(const uint8_t *, float *, - struct sr_datafeed_analog_old *, void *); - void (*dmm_details)(struct sr_datafeed_analog_old *, void *); + struct sr_datafeed_analog *, void *); + void (*dmm_details)(struct sr_datafeed_analog *, void *); gsize info_size; }; @@ -48,16 +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; - - /** The current number of already received samples. */ - uint64_t num_samples; - - int64_t starttime; + struct sr_sw_limits limits; gboolean first_run;