BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scpi-dmm: add SR_CONF_CONN getter 

Add config_get() support for conn= specs. This is a best-effort approach.
Failure to get the SCPI connection text is non-fatal during probe.
This commit is contained in:
Gerhard Sittig 2020-08-21 12:36:53 +02:00 committed by Gerhard Sittig
parent 6f9234e6f3
commit 7d95afb9be
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hardware/scpi-dmm/api.c
View File

@ -33,6 +33,7 @@ static const uint32_t drvopts[] = {
static const uint32_t devopts_generic[] = { static const uint32_t devopts_generic[] = {
SR_CONF_CONTINUOUS, SR_CONF_CONTINUOUS,
SR_CONF_CONN | SR_CONF_GET,
SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
@ -273,6 +274,11 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
sdi->conn = scpi; sdi->conn = scpi;
sdi->driver = &scpi_dmm_driver_info; sdi->driver = &scpi_dmm_driver_info;
sdi->inst_type = SR_INST_SCPI; sdi->inst_type = SR_INST_SCPI;
ret = sr_scpi_connection_id(scpi, &sdi->connection_id);
if (ret != SR_OK) {
g_free(sdi->connection_id);
sdi->connection_id = NULL;
}
sr_scpi_hw_info_free(hw_info); sr_scpi_hw_info_free(hw_info);
if (model->read_timeout_us) /* non-default read timeout */ if (model->read_timeout_us) /* non-default read timeout */
scpi->read_timeout_us = model->read_timeout_us; scpi->read_timeout_us = model->read_timeout_us;
@ -362,6 +368,11 @@ static int config_get(uint32_t key, GVariant **data,
devc = sdi->priv; devc = sdi->priv;
switch (key) { switch (key) {
case SR_CONF_CONN:
if (!sdi || !sdi->connection_id)
return SR_ERR_NA;
*data = g_variant_new_string(sdi->connection_id);
return SR_OK;
case SR_CONF_LIMIT_SAMPLES: case SR_CONF_LIMIT_SAMPLES:
case SR_CONF_LIMIT_MSEC: case SR_CONF_LIMIT_MSEC:
return sr_sw_limits_config_get(&devc->limits, key, data); return sr_sw_limits_config_get(&devc->limits, key, data);