X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fapi.c;h=e9a4417255e3f3085a8ebc9fea7e81e8e15fd7b7;hb=b2ea391147a838ea03d475add4e345d1575fdbdf;hp=aeb695530536c5c942e4548c620aa70c859ccb9d;hpb=e66d1892d0dd16ed166fc8f13493f95de0607362;p=libsigrok.git

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index aeb69553..e9a44172 100644
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -28,8 +28,11 @@ static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
 	SR_CONF_MULTIMETER,
+};
+
+static const uint32_t devopts[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_GET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_SET | SR_CONF_GET,
@@ -106,8 +109,8 @@ static int dev_open(struct sr_dev_inst *sdi)
 	return sr_usb_open(drvc->sr_ctx->libusb_ctx, usb);
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 
@@ -118,10 +121,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	return sr_sw_limits_config_set(&devc->limits, key, data);
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, NULL, devopts);
+	return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
@@ -134,7 +137,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 	std_session_send_df_header(sdi);
 
-	sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */,
+	sr_session_source_add(sdi->session, -1, 0, 10,
 			uni_t_dmm_receive_data, (void *)sdi);
 
 	return SR_OK;
@@ -174,6 +177,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	}).di
 
 SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
+	/* {{{ fs9721 */
 	DMM(
 		"tecpel-dmm-8061", fs9721,
 		"Tecpel", "DMM-8061", 2400,
@@ -181,13 +185,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
 		sr_fs9721_packet_valid, sr_fs9721_parse,
 		sr_fs9721_00_temp_c
 	),
-	DMM(
-		"uni-t-ut372", ut372,
-		"UNI-T", "UT372", 2400,
-		UT372_PACKET_SIZE,
-		sr_ut372_packet_valid, sr_ut372_parse,
-		NULL
-	),
 	DMM(
 		"uni-t-ut60a", fs9721,
 		"UNI-T", "UT60A", 2400,
@@ -202,6 +199,35 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
 		sr_fs9721_packet_valid, sr_fs9721_parse,
 		sr_fs9721_00_temp_c
 	),
+	DMM(
+		"voltcraft-vc820", fs9721,
+		"Voltcraft", "VC-820", 2400,
+		FS9721_PACKET_SIZE,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
+		NULL
+	),
+	DMM(
+		"voltcraft-vc840", fs9721,
+		"Voltcraft", "VC-840", 2400,
+		FS9721_PACKET_SIZE,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
+		sr_fs9721_00_temp_c
+	),
+	DMM(
+		"tenma-72-7745", fs9721,
+		"Tenma", "72-7745", 2400,
+		FS9721_PACKET_SIZE,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
+		sr_fs9721_00_temp_c
+	),
+	/* }}} */
+	DMM(
+		"uni-t-ut372", ut372,
+		"UNI-T", "UT372", 2400,
+		UT372_PACKET_SIZE,
+		sr_ut372_packet_valid, sr_ut372_parse,
+		NULL
+	),
 	DMM(
 		"uni-t-ut60g", es519xx,
 		/* The baudrate is actually 19230, see "Note 1" below. */
@@ -265,11 +291,9 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
 		sr_ut71x_packet_valid, sr_ut71x_parse, NULL
 	),
 	DMM(
-		"voltcraft-vc820", fs9721,
-		"Voltcraft", "VC-820", 2400,
-		FS9721_PACKET_SIZE,
-		sr_fs9721_packet_valid, sr_fs9721_parse,
-		NULL
+		"uni-t-ut804", ut71x,
+		"UNI-T", "UT804", 2400, UT71X_PACKET_SIZE,
+		sr_ut71x_packet_valid, sr_ut71x_parse, NULL
 	),
 	DMM(
 		"voltcraft-vc830", fs9922,
@@ -283,13 +307,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
 		sr_fs9922_packet_valid, sr_fs9922_parse,
 		&sr_fs9922_z1_diode
 	),
-	DMM(
-		"voltcraft-vc840", fs9721,
-		"Voltcraft", "VC-840", 2400,
-		FS9721_PACKET_SIZE,
-		sr_fs9721_packet_valid, sr_fs9721_parse,
-		sr_fs9721_00_temp_c
-	),
 	DMM(
 		"voltcraft-vc870", vc870,
 		"Voltcraft", "VC-870", 9600, VC870_PACKET_SIZE,
@@ -328,13 +345,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
 		UT71X_PACKET_SIZE,
 		sr_ut71x_packet_valid, sr_ut71x_parse, NULL
 	),
-	DMM(
-		"tenma-72-7745", fs9721,
-		"Tenma", "72-7745", 2400,
-		FS9721_PACKET_SIZE,
-		sr_fs9721_packet_valid, sr_fs9721_parse,
-		sr_fs9721_00_temp_c
-	),
 	DMM(
 		"tenma-72-7750", es519xx,
 		/* The baudrate is actually 19230, see "Note 1" below. */