output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hardware / kecheng-kc-330b / protocol.h

diff --git a/src/hardware/kecheng-kc-330b/protocol.h b/src/hardware/kecheng-kc-330b/protocol.h
index a2536898895f2f17e9dfabfb358850ac7c874b1c..e750ff472ce6d801f080a973883f6ed321d57ca5 100644 (file)
--- a/src/hardware/kecheng-kc-330b/protocol.h
+++ b/src/hardware/kecheng-kc-330b/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "kecheng-kc-330b"
@@ -66,32 +66,26 @@ enum {
        DEVICE_INACTIVE,
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
-       /* Acquisition settings */
        uint64_t limit_samples;
        int sample_interval;
        int alarm_low;
        int alarm_high;
-       uint64_t mqflags;
+       enum sr_mqflag mqflags;
        int data_source;
 
-       /* Operational state */
        int state;
        gboolean config_dirty;
        uint64_t num_samples;
        uint64_t stored_samples;
-       void *cb_data;
        struct libusb_transfer *xfer;
        unsigned char buf[128];
 
-       /* Temporary state across callbacks */
        gint64 last_live_request;
-
 };
 
 SR_PRIV int kecheng_kc_330b_handle_events(int fd, int revents, void *cb_data);
-SR_PRIV void kecheng_kc_330b_receive_transfer(struct libusb_transfer *transfer);
+SR_PRIV void LIBUSB_CALL kecheng_kc_330b_receive_transfer(struct libusb_transfer *transfer);
 SR_PRIV int kecheng_kc_330b_configure(const struct sr_dev_inst *sdi);
 SR_PRIV int kecheng_kc_330b_set_date_time(struct sr_dev_inst *sdi);
 SR_PRIV int kecheng_kc_330b_recording_get(const struct sr_dev_inst *sdi,