X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=ddd4e71c96d7a496c69715f58dc963da5cac7707;hb=e5ef649be3167dbb9f6403e2c1d0e2e1b09d3a0c;hp=ecaba493788e042e16dd8ce5571d46cc79733fd9;hpb=329733d92c5004f0fe308eff26b9537fded2cdf3;p=libsigrok.git
diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index ecaba493..ddd4e71c 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -19,13 +19,13 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
#include
-#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#include "protocol.h"
@@ -92,7 +92,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sr_info("Probing serial port %s.", conn);
- drvc = di->priv;
+ drvc = di->context;
devices = NULL;
serial_flush(serial);
@@ -152,7 +152,7 @@ scan_cleanup:
static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return ((struct drv_context *)(di->context))->instances;
}
static int cleanup(const struct sr_dev_driver *di)
@@ -178,13 +178,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
switch (key) {
case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = g_variant_get_uint64(data);
- sr_dbg("Setting sample limit to %" PRIu64 ".",
- devc->limit_samples);
break;
case SR_CONF_LIMIT_MSEC:
devc->limit_msec = g_variant_get_uint64(data);
- sr_dbg("Setting time limit to %" PRIu64 "ms.",
- devc->limit_msec);
break;
default:
return SR_ERR_NA;
@@ -274,7 +270,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
.dev_close = std_serial_dev_close, \
.dev_acquisition_start = dev_acquisition_start, \
.dev_acquisition_stop = dev_acquisition_stop, \
- .priv = NULL, \
+ .context = NULL, \
}, \
VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, DELAY, \
REQUEST, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \
@@ -563,6 +559,24 @@ SR_PRIV const struct dmm_info *serial_dmm_drivers[] = {
sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse,
NULL
),
+ DMM(
+ "tenma-72-7730-ser", ut71x,
+ "Tenma", "72-7730 (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-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",