From: Uwe Hermann <redacted>
Date: Wed, 13 Nov 2013 21:43:26 +0000 (+0100)
Subject: uni-t-dmm: Drop unused packet_request callback.
X-Git-Tag: libsigrok-0.3.0~558
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=26e0361cc61e8a2236f6667f3e2ac4edd3dc68d2;p=libsigrok.git

uni-t-dmm: Drop unused packet_request callback.
---

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index 84a288b9..cc14feb9 100644
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -49,28 +49,28 @@ SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
 SR_PRIV struct dmm_info udmms[] = {
 	{
 		"Tecpel", "DMM-8061", 2400,
-		FS9721_PACKET_SIZE, NULL,
+		FS9721_PACKET_SIZE,
 		sr_fs9721_packet_valid, sr_fs9721_parse,
 		sr_fs9721_00_temp_c,
 		&tecpel_dmm_8061_driver_info, receive_data_TECPEL_DMM_8061,
 	},
 	{
 		"UNI-T", "UT60A", 2400,
-		FS9721_PACKET_SIZE, NULL,
+		FS9721_PACKET_SIZE,
 		sr_fs9721_packet_valid, sr_fs9721_parse,
 		NULL,
 		&uni_t_ut60a_driver_info, receive_data_UNI_T_UT60A,
 	},
 	{
 		"UNI-T", "UT60E", 2400,
-		FS9721_PACKET_SIZE, NULL,
+		FS9721_PACKET_SIZE,
 		sr_fs9721_packet_valid, sr_fs9721_parse,
 		sr_fs9721_00_temp_c,
 		&uni_t_ut60e_driver_info, receive_data_UNI_T_UT60E,
 	},
 	{
 		"UNI-T", "UT61D", 2400,
-		FS9922_PACKET_SIZE, NULL,
+		FS9922_PACKET_SIZE,
 		sr_fs9922_packet_valid, sr_fs9922_parse,
 		NULL,
 		&uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D,
@@ -86,14 +86,14 @@ SR_PRIV struct dmm_info udmms[] = {
 		 * this DMM, of course).
 		 */
 		"UNI-T", "UT61E", 19200,
-		ES51922_PACKET_SIZE, NULL,
+		ES51922_PACKET_SIZE,
 		sr_es51922_packet_valid, sr_es51922_parse,
 		NULL,
 		&uni_t_ut61e_driver_info, receive_data_UNI_T_UT61E,
 	},
 	{
 		"Voltcraft", "VC-820", 2400,
-		FS9721_PACKET_SIZE, NULL,
+		FS9721_PACKET_SIZE,
 		sr_fs9721_packet_valid, sr_fs9721_parse,
 		NULL,
 		&voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820,
@@ -105,14 +105,14 @@ SR_PRIV struct dmm_info udmms[] = {
 		 * bit "z1" to indicate "diode mode" and "voltage".
 		 */
 		"Voltcraft", "VC-830", 2400,
-		FS9922_PACKET_SIZE, NULL,
+		FS9922_PACKET_SIZE,
 		sr_fs9922_packet_valid, sr_fs9922_parse,
 		&sr_fs9922_z1_diode,
 		&voltcraft_vc830_driver_info, receive_data_VOLTCRAFT_VC830,
 	},
 	{
 		"Voltcraft", "VC-840", 2400,
-		FS9721_PACKET_SIZE, NULL,
+		FS9721_PACKET_SIZE,
 		sr_fs9721_packet_valid, sr_fs9721_parse,
 		sr_fs9721_00_temp_c,
 		&voltcraft_vc840_driver_info, receive_data_VOLTCRAFT_VC840,
diff --git a/hardware/uni-t-dmm/protocol.h b/hardware/uni-t-dmm/protocol.h
index d01e0790..446f6a79 100644
--- a/hardware/uni-t-dmm/protocol.h
+++ b/hardware/uni-t-dmm/protocol.h
@@ -55,7 +55,6 @@ struct dmm_info {
 	char *device;
 	uint32_t baudrate;
 	int packet_size;
-	int (*packet_request)(struct sr_serial_dev_inst *);
 	gboolean (*packet_valid)(const uint8_t *);
 	int (*packet_parse)(const uint8_t *, float *,
 			    struct sr_datafeed_analog *, void *);