X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmanson-hcs-3xxx%2Fprotocol.h;h=df8814ed14a8e9e4123f6a484c1e0198e4874a67;hb=459324acb8769240513e0bb3ef3c04ad295e8b19;hp=c63f943d7645679f285440621df847f386994ddf;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git

diff --git a/src/hardware/manson-hcs-3xxx/protocol.h b/src/hardware/manson-hcs-3xxx/protocol.h
index c63f943d..df8814ed 100644
--- a/src/hardware/manson-hcs-3xxx/protocol.h
+++ b/src/hardware/manson-hcs-3xxx/protocol.h
@@ -19,10 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-/** @file
-  *  <em>Manson HCS-3xxx Series</em> power supply driver
-  *  @internal
-  */
+/**
+ * @file
+ *
+ * <em>Manson HCS-3xxx Series</em> power supply driver
+ *
+ * @internal
+ */
 
 #ifndef LIBSIGROK_HARDWARE_MANSON_HCS_3XXX_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_MANSON_HCS_3XXX_PROTOCOL_H
@@ -58,8 +61,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 +71,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. */