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

dcttech-usbrelay: adjust serial number and connection string logic 

Store the USB relay card's serial number such that users can tell apart
multiple connected cards. Hold the HIDAPI path in the 'connection_id'
member because 'conn' is something internal, not for display purposes.
This commit is contained in:
Gerhard Sittig 2021-07-22 07:09:48 +02:00
parent 59f6765508
commit e333a40c1c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hardware/dcttech-usbrelay/api.c
View File

@ -98,6 +98,8 @@ static struct sr_dev_inst *probe_device(const char *path, size_t relay_count)
* caller fills in vendor, model, conn from USB enum details. * caller fills in vendor, model, conn from USB enum details.
*/ */
sdi = g_malloc0(sizeof(*sdi)); sdi = g_malloc0(sizeof(*sdi));
sdi->serial_num = g_strdup(serno);
sdi->connection_id = g_strdup(path);
devc = g_malloc0(sizeof(*devc)); devc = g_malloc0(sizeof(*devc));
sdi->priv = devc; sdi->priv = devc;
devc->hid_path = g_strdup(path); devc->hid_path = g_strdup(path);
@ -202,7 +204,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
/* Amend driver instance from USB enumeration details. */ /* Amend driver instance from USB enumeration details. */
sdi->vendor = g_strdup_printf("%ls", curdev->manufacturer_string); sdi->vendor = g_strdup_printf("%ls", curdev->manufacturer_string);
sdi->model = g_strdup_printf("%ls", curdev->product_string); sdi->model = g_strdup_printf("%ls", curdev->product_string);
sdi->conn = g_strdup(curdev->path);
sdi->driver = &dcttech_usbrelay_driver_info; sdi->driver = &dcttech_usbrelay_driver_info;
sdi->inst_type = SR_INST_USB; sdi->inst_type = SR_INST_USB;
@ -256,9 +257,9 @@ static int config_get(uint32_t key, GVariant **data,
if (!cg) { if (!cg) {
switch (key) { switch (key) {
case SR_CONF_CONN: case SR_CONF_CONN:
if (!sdi->conn) if (!sdi->connection_id)
return SR_ERR_NA; return SR_ERR_NA;
*data = g_variant_new_string(sdi->conn); *data = g_variant_new_string(sdi->connection_id);
return SR_OK; return SR_OK;
default: default:
return SR_ERR_NA; return SR_ERR_NA;