X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=f53381bf93856f3b2d1ae935ec8d8a5deca49f4a;hb=208c1d35435626a11afa1ab301b2071b2a4e187b;hp=3f065c5910aacaec8bb463cec64e668c52083b98;hpb=b1cadcfbef49ab24dbcf0987b927c4bffa207fcc;p=libsigrok.git diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index 3f065c59..f53381bf 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -219,11 +219,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - if (!(devc = sdi->priv)) { - sr_err("sdi->priv was NULL."); - return SR_ERR_BUG; - } - + devc = sdi->priv; devc->cb_data = cb_data; /* @@ -234,7 +230,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) devc->num_samples = 0; devc->starttime = g_get_monotonic_time(); - /* Send header packet to the session bus. */ std_session_send_df_header(cb_data, LOG_PREFIX); /* Poll every 50ms, or whenever some data comes in. */ @@ -565,6 +560,18 @@ SR_PRIV const struct dmm_info *serial_dmm_drivers[] = { 2400, UT71X_PACKET_SIZE, 0, 0, NULL, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), + DMM( + "tenma-72-7732-ser", ut71x, + "Tenma", "72-7732 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "tenma-72-9380a-ser", ut71x, + "Tenma", "72-9380A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), DMM( "tenma-72-7745-ser", fs9721, "Tenma", "72-7745 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", @@ -587,5 +594,17 @@ SR_PRIV const struct dmm_info *serial_dmm_drivers[] = { sr_brymen_bm25x_packet_valid, sr_brymen_bm25x_parse, NULL ), + DMM( + "velleman-dvm4100", dtm0660, + "Velleman", "DVM4100", "2400/8n1/rts=0/dtr=1", + 2400, DTM0660_PACKET_SIZE, 0, 0, NULL, + sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL + ), + DMM( + "peaktech-3415", dtm0660, + "Peaktech", "3415", "2400/8n1/rts=0/dtr=1", + 2400, DTM0660_PACKET_SIZE, 0, 0, NULL, + sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL + ), NULL };