X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fapi.c;h=a77aebbae5cc320fc5de61e3bc201f1c3ef09f00;hb=1e726f568d6d72a8c6afdcd8fa98b98e910ad523;hp=ac0ebbfd0182d79c018e1c4320080d83c135240d;hpb=b1cadcfbef49ab24dbcf0987b927c4bffa207fcc;p=libsigrok.git diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c index ac0ebbfd..a77aebba 100644 --- a/src/hardware/uni-t-dmm/api.c +++ b/src/hardware/uni-t-dmm/api.c @@ -189,17 +189,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_OK; } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct dev_context *devc; devc = sdi->priv; - - devc->cb_data = cb_data; - devc->starttime = g_get_monotonic_time(); - /* Send header packet to the session bus. */ std_session_send_df_header(sdi, LOG_PREFIX); sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */, @@ -208,19 +204,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { - struct sr_datafeed_packet packet; - - (void)cb_data; - sr_dbg("Stopping acquisition."); - - /* Send end packet to the session bus. */ - sr_dbg("Sending SR_DF_END."); - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); - + std_session_send_df_end(sdi, LOG_PREFIX); sr_session_source_remove(sdi->session, -1); return SR_OK; @@ -394,6 +381,18 @@ SR_PRIV const struct dmm_info *uni_t_dmm_drivers[] = { UT71X_PACKET_SIZE, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), + DMM( + "tenma-72-7732", ut71x, + "Tenma", "72-7732", 2400, + UT71X_PACKET_SIZE, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "tenma-72-9380a", ut71x, + "Tenma", "72-9380A", 2400, + UT71X_PACKET_SIZE, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), DMM( "tenma-72-7745", es519xx, "Tenma", "72-7745", 2400,