lecroy-xstream: Use array-based approach for timebases/vdivs.

[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 3cec92981e74e84b7caea49ad94d132b03613b93..fa68f71f311fdf19a9547df635db2ab08fbbe1e8 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;