X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fprotocol.h;h=9a43dca27693cc9d9ad0066cacc5e803d2e21abf;hb=43376f3324cddd257a0260b06d9db8180c35fdf3;hp=7c52b47ffec61a48b206f22c78feb2c8b0fce4fb;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/protocol.h b/src/hardware/norma-dmm/protocol.h
index 7c52b47f..9a43dca2 100644
--- a/src/hardware/norma-dmm/protocol.h
+++ b/src/hardware/norma-dmm/protocol.h
@@ -61,11 +61,7 @@ struct dev_context {
 	int type;		/**< DM9x0, e.g. 5 = DM950 */
 
 	/* Acquisition settings */
-	uint64_t limit_samples;	/**< Target number of samples */
-	uint64_t limit_msec;	/**< Target sampling time */
-
-	/* Opaque pointer passed in by frontend. */
-	void *cb_data;
+	struct sr_sw_limits limits;
 
 	/* Operational state */
 	int last_req;			/**< Last request. */
@@ -74,8 +70,6 @@ struct dev_context {
 	int lowbatt;			/**< Low battery. 1=low, 2=critical. */
 
 	/* Temporary state across callbacks */
-	uint64_t num_samples;		/**< Current #samples. */
-	GTimer *elapsed_msec;		/**< Used for limit_msec */
 	uint8_t buf[NMADMM_BUFSIZE];	/**< Buffer for read callback */
 	int buflen;			/**< Data len in buf */
 };