X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=b66274c5d7730c985e3d9d10387e3e1a62c86098;hb=9f51c463d1bfd182ddf8ae1c5bc83377ef93d2bc;hp=25e7bb61a997c8809753adbe95d8204c484927d5;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git
diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index 25e7bb61..b66274c5 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -19,6 +19,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -40,11 +41,6 @@ static const uint32_t devopts[] = {
SR_CONF_LIMIT_MSEC | SR_CONF_SET,
};
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
@@ -135,6 +131,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sdi->vendor = g_strdup(dmm->vendor);
sdi->model = g_strdup(dmm->device);
devc = g_malloc0(sizeof(struct dev_context));
+ sr_sw_limits_init(&devc->limits);
sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial;
sdi->priv = devc;
@@ -149,16 +146,6 @@ scan_cleanup:
return devices;
}
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
- return ((struct drv_context *)(di->context))->instances;
-}
-
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
@@ -174,18 +161,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
return SR_ERR_BUG;
}
- switch (key) {
- case SR_CONF_LIMIT_SAMPLES:
- devc->limit_samples = g_variant_get_uint64(data);
- break;
- case SR_CONF_LIMIT_MSEC:
- devc->limit_msec = g_variant_get_uint64(data);
- break;
- default:
- return SR_ERR_NA;
- }
-
- return SR_OK;
+ 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,
@@ -210,7 +186,7 @@ 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;
struct sr_serial_dev_inst *serial;
@@ -218,23 +194,10 @@ 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;
-
- /*
- * Reset the number of samples to take. If we've already collected our
- * quota, but we start a new session, and don't reset this, we'll just
- * quit without acquiring any new samples.
- */
- 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);
+ sr_sw_limits_acquisition_start(&devc->limits);
+ std_session_send_df_header(sdi, LOG_PREFIX);
/* Poll every 50ms, or whenever some data comes in. */
serial = sdi->conn;
@@ -244,9 +207,9 @@ 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)
{
- return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
+ return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
}
@@ -258,10 +221,9 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
.longname = VENDOR " " MODEL, \
.api_version = 1, \
.init = init, \
- .cleanup = cleanup, \
+ .cleanup = std_cleanup, \
.scan = scan, \
- .dev_list = dev_list, \
- .dev_clear = dev_clear, \
+ .dev_list = std_dev_list, \
.config_get = NULL, \
.config_set = config_set, \
.config_list = config_list, \
@@ -558,6 +520,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",
@@ -580,5 +560,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
};