X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fprotocol.h;h=d3aaf37be9fed2ea62174f50381d9f9d3185bc1e;hb=15f96409dc54fd2ef784c59156daedd9acfa78ed;hp=10d95d0978a75d1eb126ca9c2f39020f6f835dd0;hpb=20a7cd07c9d1460e335fc9c3e39378ab708ef4bc;p=libsigrok.git diff --git a/src/hardware/mic-985xx/protocol.h b/src/hardware/mic-985xx/protocol.h index 10d95d09..d3aaf37b 100644 --- a/src/hardware/mic-985xx/protocol.h +++ b/src/hardware/mic-985xx/protocol.h @@ -25,7 +25,7 @@ #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #define LOG_PREFIX "mic-985xx" @@ -36,9 +36,9 @@ enum { }; struct mic_dev_info { - char *vendor; - char *device; - char *conn; + const char *vendor; + const char *device; + const char *conn; uint32_t max_sample_points; gboolean has_temperature; gboolean has_humidity; @@ -54,19 +54,7 @@ extern SR_PRIV const struct mic_dev_info mic_devs[]; /** 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; uint8_t buf[SERIAL_BUFSIZE]; int bufoffset;