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

[libsigrok.git] / src / hardware / lecroy-xstream / protocol.h

diff --git a/src/hardware/lecroy-xstream/protocol.h b/src/hardware/lecroy-xstream/protocol.h
index fd5eb14ea906b532aae2204cf0787620826f539d..f639dfffa665fd4fa7bf8549d044d1bb302b7be4 100644 (file)
--- a/src/hardware/lecroy-xstream/protocol.h
+++ b/src/hardware/lecroy-xstream/protocol.h
@@ -38,12 +38,6 @@ struct scope_config {
 
        const char *(*analog_names)[];
 
-       const uint32_t (*devopts)[];
-       const uint8_t num_devopts;
-
-       const uint32_t (*analog_devopts)[];
-       const uint8_t num_analog_devopts;
-
        const char *(*coupling_options)[];
        const uint8_t num_coupling_options;
 
@@ -51,11 +45,12 @@ struct scope_config {
        const uint8_t num_trigger_sources;
 
        const char *(*trigger_slopes)[];
+       const uint8_t num_trigger_slopes;
 
-       const struct sr_rational *timebases;
+       const uint64_t (*timebases)[][2];
        const uint8_t num_timebases;
 
-       const struct sr_rational *vdivs;
+       const uint64_t (*vdivs)[][2];
        const uint8_t num_vdivs;
 
        const uint8_t num_xdivs;
@@ -82,7 +77,6 @@ struct scope_state {
        uint64_t sample_rate;
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
        const void *model_config;
        void *model_state;
@@ -94,16 +88,17 @@ struct dev_context {
        uint64_t num_frames;
 
        uint64_t frame_limit;
-
 };
 
 SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi);
 SR_PRIV int lecroy_xstream_request_data(const struct sr_dev_inst *sdi);
 SR_PRIV int lecroy_xstream_receive_data(int fd, int revents, void *cb_data);
 
-SR_PRIV struct scope_state *lecroy_xstream_state_new(struct scope_config *config);
 SR_PRIV void lecroy_xstream_state_free(struct scope_state *state);
 SR_PRIV int lecroy_xstream_state_get(struct sr_dev_inst *sdi);
-SR_PRIV int lecroy_xstream_update_sample_rate(const struct sr_dev_inst *sdi);
+SR_PRIV int lecroy_xstream_channel_state_set(const struct sr_dev_inst *sdi,
+               const int ch_index, gboolean ch_state);
+SR_PRIV int lecroy_xstream_update_sample_rate(const struct sr_dev_inst *sdi,
+               int num_of_samples);
 
 #endif