testo: Convert to SR_DF_ANALOG.

[libsigrok.git] / src / hardware / manson-hcs-3xxx / protocol.h

diff --git a/src/hardware/manson-hcs-3xxx/protocol.h b/src/hardware/manson-hcs-3xxx/protocol.h
index 465cdd9d9315f38fe01332659ab2f895e044228d..bb898f2011828f54d28cd0dc640e2d9a67d9c233 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/protocol.h
+++ b/src/hardware/manson-hcs-3xxx/protocol.h
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "manson-hcs-3xxx"
@@ -58,8 +58,8 @@ enum {
 /** Information on a single model. */
 struct hcs_model {
        int model_id;      /**< Model info */
-       char *name;        /**< Model name */
-       char *id;          /**< Model ID, like delivered by interface */
+       const char *name;  /**< Model name */
+       const char *id;    /**< Model ID, like delivered by interface */
        double voltage[3]; /**< Min, max, step */
        double current[3]; /**< Min, max, step */
 };
@@ -68,15 +68,10 @@ struct hcs_model {
 struct dev_context {
        const struct hcs_model *model; /**< Model information. */
 
-       uint64_t limit_samples;
-       uint64_t limit_msec;
-       uint64_t num_samples;
-       int64_t starttime;
+       struct sr_sw_limits limits;
        int64_t req_sent_at;
        gboolean reply_pending;
 
-       void *cb_data;
-
        float current;          /**< Last current value [A] read from device. */
        float current_max;      /**< Output current set. */
        float current_max_device;/**< Device-provided maximum output current. */