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

diff --git a/src/hardware/manson-hcs-3xxx/protocol.h b/src/hardware/manson-hcs-3xxx/protocol.h
index e9035377..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
@@ -31,7 +34,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,25 +61,20 @@ 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 */
 };
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
-	const struct hcs_model *model; /**< Model informaion. */
+	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. */
@@ -92,7 +90,7 @@ struct dev_context {
 };
 
 SR_PRIV int hcs_parse_volt_curr_mode(struct sr_dev_inst *sdi, char **tokens);
-SR_PRIV int hcs_read_reply(struct sr_serial_dev_inst *serial, int lines, char* buf, int buflen);
+SR_PRIV int hcs_read_reply(struct sr_serial_dev_inst *serial, int lines, char *buf, int buflen);
 SR_PRIV int hcs_send_cmd(struct sr_serial_dev_inst *serial, const char *cmd, ...);
 SR_PRIV int hcs_receive_data(int fd, int revents, void *cb_data);