X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fprotocol.h;h=49492352f5bfa81f0b36ad4a61e78aba2a9137ba;hb=9ae544b6ce98097f9610a0adab8aa14da0d259c9;hp=b368576b92858395010a43e624d0279e931c5de9;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/protocol.h b/src/hardware/gmc-mh-1x-2x/protocol.h
index b368576b..49492352 100644
--- a/src/hardware/gmc-mh-1x-2x/protocol.h
+++ b/src/hardware/gmc-mh-1x-2x/protocol.h
@@ -87,16 +87,15 @@ struct dev_context {
 	enum model model;	/**< Model code. */
 
 	/* Acquisition settings */
-	uint64_t limit_samples;	/**< Target number of samples */
-	uint64_t limit_msec;	/**< Target sampling time */
+	struct sr_sw_limits limits;
 
 	/* Operational state */
 	gboolean settings_ok;	/**< Settings msg received yet. */
 	int msg_type;       /**< Message type (MSGID_INF, ...). */
 	int msg_len;        /**< Message length (valid when msg, curr. type known).*/
-	int mq;             /**< Measured quantity */
-	int unit;           /**< Measured unit */
-	uint64_t mqflags;	/**< Measured quantity flags */
+	enum sr_mq mq;      /**< Measured quantity */
+	enum sr_unit unit;  /**< Measured unit */
+	enum sr_mqflag mqflags;	/**< Measured quantity flags */
 	float value;		/**< Measured value */
 	float scale;		/**< Scale for value. */
 	int8_t scale1000;   /**< Additional scale factor 1000x. */
@@ -111,8 +110,6 @@ struct dev_context {
 	gboolean response_pending; /**< Request sent, response is pending. */
 
 	/* Temporary state across callbacks */
-	uint64_t num_samples;	/**< Current #samples for limit_samples */
-	GTimer *elapsed_msec;	/**< Used for sampling with limit_msec  */
 	uint8_t buf[GMC_BUFSIZE];	/**< Buffer for read callback */
 	int buflen;			/**< Data len in buf */
 };