X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fapi.c;h=150be80379aa377f729d1137dcd0662daa390197;hb=f2ad79d19b616b61e50495bb87473630bb6cc594;hp=5730633cac52e683a0593af505d5e05b8be41f83;hpb=05199c0ac9f15f229d43e50e86c4c1eadc55deac;p=libsigrok.git diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c index 5730633c..150be803 100644 --- a/src/hardware/uni-t-dmm/api.c +++ b/src/hardware/uni-t-dmm/api.c @@ -109,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; @@ -121,8 +121,8 @@ 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, drvopts, devopts); } @@ -137,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; @@ -267,6 +267,11 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers, "UNI-T", "UT71E", 2400, UT71X_PACKET_SIZE, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), + DMM( + "uni-t-ut804", ut71x, + "UNI-T", "UT804", 2400, UT71X_PACKET_SIZE, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), DMM( "voltcraft-vc820", fs9721, "Voltcraft", "VC-820", 2400,