BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uni-t-dmm: Drop unused packet_request callback.

This commit is contained in:
Uwe Hermann 2013-11-13 22:43:26 +01:00
parent c4f2dfd0f0
commit 26e0361cc6
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hardware/uni-t-dmm/api.c
View File

@ -49,28 +49,28 @@ SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
SR_PRIV struct dmm_info udmms[] = { SR_PRIV struct dmm_info udmms[] = {
{ {
"Tecpel", "DMM-8061", 2400, "Tecpel", "DMM-8061", 2400,
FS9721_PACKET_SIZE, NULL, FS9721_PACKET_SIZE,
sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c, sr_fs9721_00_temp_c,
&tecpel_dmm_8061_driver_info, receive_data_TECPEL_DMM_8061, &tecpel_dmm_8061_driver_info, receive_data_TECPEL_DMM_8061,
}, },
{ {
"UNI-T", "UT60A", 2400, "UNI-T", "UT60A", 2400,
FS9721_PACKET_SIZE, NULL, FS9721_PACKET_SIZE,
sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_packet_valid, sr_fs9721_parse,
NULL, NULL,
&uni_t_ut60a_driver_info, receive_data_UNI_T_UT60A, &uni_t_ut60a_driver_info, receive_data_UNI_T_UT60A,
}, },
{ {
"UNI-T", "UT60E", 2400, "UNI-T", "UT60E", 2400,
FS9721_PACKET_SIZE, NULL, FS9721_PACKET_SIZE,
sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c, sr_fs9721_00_temp_c,
&uni_t_ut60e_driver_info, receive_data_UNI_T_UT60E, &uni_t_ut60e_driver_info, receive_data_UNI_T_UT60E,
}, },
{ {
"UNI-T", "UT61D", 2400, "UNI-T", "UT61D", 2400,
FS9922_PACKET_SIZE, NULL, FS9922_PACKET_SIZE,
sr_fs9922_packet_valid, sr_fs9922_parse, sr_fs9922_packet_valid, sr_fs9922_parse,
NULL, NULL,
&uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D, &uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D,
@ -86,14 +86,14 @@ SR_PRIV struct dmm_info udmms[] = {
* this DMM, of course). * this DMM, of course).
*/ */
"UNI-T", "UT61E", 19200, "UNI-T", "UT61E", 19200,
ES51922_PACKET_SIZE, NULL, ES51922_PACKET_SIZE,
sr_es51922_packet_valid, sr_es51922_parse, sr_es51922_packet_valid, sr_es51922_parse,
NULL, NULL,
&uni_t_ut61e_driver_info, receive_data_UNI_T_UT61E, &uni_t_ut61e_driver_info, receive_data_UNI_T_UT61E,
}, },
{ {
"Voltcraft", "VC-820", 2400, "Voltcraft", "VC-820", 2400,
FS9721_PACKET_SIZE, NULL, FS9721_PACKET_SIZE,
sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_packet_valid, sr_fs9721_parse,
NULL, NULL,
&voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820, &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". * bit "z1" to indicate "diode mode" and "voltage".
*/ */
"Voltcraft", "VC-830", 2400, "Voltcraft", "VC-830", 2400,
FS9922_PACKET_SIZE, NULL, FS9922_PACKET_SIZE,
sr_fs9922_packet_valid, sr_fs9922_parse, sr_fs9922_packet_valid, sr_fs9922_parse,
&sr_fs9922_z1_diode, &sr_fs9922_z1_diode,
&voltcraft_vc830_driver_info, receive_data_VOLTCRAFT_VC830, &voltcraft_vc830_driver_info, receive_data_VOLTCRAFT_VC830,
}, },
{ {
"Voltcraft", "VC-840", 2400, "Voltcraft", "VC-840", 2400,
FS9721_PACKET_SIZE, NULL, FS9721_PACKET_SIZE,
sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c, sr_fs9721_00_temp_c,
&voltcraft_vc840_driver_info, receive_data_VOLTCRAFT_VC840, &voltcraft_vc840_driver_info, receive_data_VOLTCRAFT_VC840,

1
hardware/uni-t-dmm/protocol.h
View File

@ -55,7 +55,6 @@ struct dmm_info {
char *device; char *device;
uint32_t baudrate; uint32_t baudrate;
int packet_size; int packet_size;
int (*packet_request)(struct sr_serial_dev_inst *);
gboolean (*packet_valid)(const uint8_t *); gboolean (*packet_valid)(const uint8_t *);
int (*packet_parse)(const uint8_t *, float *, int (*packet_parse)(const uint8_t *, float *,
struct sr_datafeed_analog *, void *); struct sr_datafeed_analog *, void *);