rigol-ds: Calculate effective samplerate.

[libsigrok.git] / hardware / zeroplus-logic-cube / protocol.h

diff --git a/hardware/zeroplus-logic-cube/protocol.h b/hardware/zeroplus-logic-cube/protocol.h
index d3f1ea1705647b502bca1e977c28cf23394873c0..09f82287bd87db9eddbed913611ce480b5b61460 100644 (file)
--- a/hardware/zeroplus-logic-cube/protocol.h
+++ b/hardware/zeroplus-logic-cube/protocol.h
@@ -28,14 +28,7 @@
 #include "libsigrok-internal.h"
 #include "analyzer.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "zeroplus: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "zeroplus"
 
 /* Private, per-device-instance driver context. */
 struct dev_context {
@@ -44,13 +37,14 @@ struct dev_context {
        uint64_t limit_samples;
        int num_channels;
        int memory_size;
-       unsigned int max_memory_size;
+       unsigned int max_sample_depth;
        //uint8_t probe_mask;
        //uint8_t trigger_mask[NUM_TRIGGER_STAGES];
        //uint8_t trigger_value[NUM_TRIGGER_STAGES];
        // uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
        int trigger;
        unsigned int capture_ratio;
+       double cur_threshold;
        const struct zp_model *prof;
 };
 
@@ -58,6 +52,7 @@ SR_PRIV unsigned int get_memory_size(int type);
 SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate);
 SR_PRIV int set_limit_samples(struct dev_context *devc, uint64_t samples);
 SR_PRIV int set_capture_ratio(struct dev_context *devc, uint64_t ratio);
+SR_PRIV int set_voltage_threshold(struct dev_context *devc, double thresh);
 SR_PRIV void set_triggerbar(struct dev_context *devc);
 
 #endif