X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fagilent-dmm%2Fagilent-dmm.h;h=2c5da1f8b68722dad1486c03dc7aaffade8cd3d0;hb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;hp=2277111f62c3d3ecc74f760af40f7b437dbc3799;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/agilent-dmm/agilent-dmm.h b/src/hardware/agilent-dmm/agilent-dmm.h
index 2277111f..2c5da1f8 100644
--- a/src/hardware/agilent-dmm/agilent-dmm.h
+++ b/src/hardware/agilent-dmm/agilent-dmm.h
@@ -24,14 +24,21 @@
 
 #define AGDMM_BUFSIZE  256
 
+/* Always USB-serial, 1ms is plenty. */
+#define SERIAL_WRITE_TIMEOUT_MS 1
+
 /* Supported models */
 enum {
-	AGILENT_U1231A = 1,
-	AGILENT_U1232A,
-	AGILENT_U1233A,
-	AGILENT_U1251A,
-	AGILENT_U1252A,
-	AGILENT_U1253A,
+	AGILENT_U1231 = 1,
+	AGILENT_U1232,
+	AGILENT_U1233,
+
+	AGILENT_U1241,
+	AGILENT_U1242,
+
+	AGILENT_U1251,
+	AGILENT_U1252,
+	AGILENT_U1253,
 };
 
 /* Supported device profiles */
@@ -48,9 +55,6 @@ struct dev_context {
 	uint64_t limit_samples;
 	uint64_t limit_msec;
 
-	/* Opaque pointer passed in by the frontend. */
-	void *cb_data;
-
 	/* Runtime. */
 	uint64_t num_samples;
 	int64_t jobqueue[8];