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

Removal of sdi->index, step 6: fix sysclk-lwla

This commit is contained in:
Soeren Apel 2014-09-28 11:10:26 +02:00 committed by Bert Vermeulen
parent 65340dd5df
commit c79d4444fe
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hardware/sysclk-lwla/api.c
View File

@ -99,7 +99,7 @@ static GSList *gen_channel_list(int num_channels)
return list; return list;
} }
static struct sr_dev_inst *dev_inst_new(int device_index) static struct sr_dev_inst *dev_inst_new()
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct dev_context *devc; struct dev_context *devc;
@ -112,7 +112,7 @@ static struct sr_dev_inst *dev_inst_new(int device_index)
} }
/* Register the device with libsigrok. */ /* Register the device with libsigrok. */
sdi = sr_dev_inst_new(device_index, SR_ST_INACTIVE, sdi = sr_dev_inst_new(SR_ST_INACTIVE,
VENDOR_NAME, MODEL_NAME, NULL); VENDOR_NAME, MODEL_NAME, NULL);
if (!sdi) { if (!sdi) {
sr_err("Failed to instantiate device."); sr_err("Failed to instantiate device.");
@ -138,7 +138,7 @@ static GSList *scan(GSList *options)
struct sr_usb_dev_inst *usb; struct sr_usb_dev_inst *usb;
struct sr_config *src; struct sr_config *src;
const char *conn; const char *conn;
int device_index; char connection_id[64];
drvc = di->priv; drvc = di->priv;
conn = USB_VID_PID; conn = USB_VID_PID;
@ -152,13 +152,15 @@ static GSList *scan(GSList *options)
} }
usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn); usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn);
devices = NULL; devices = NULL;
device_index = g_slist_length(drvc->instances);
for (node = usb_devices; node != NULL; node = node->next) { for (node = usb_devices; node != NULL; node = node->next) {
usb = node->data; usb = node->data;
usb_get_port_path(libusb_get_device(usb->devhdl),
connection_id, sizeof(connection_id));
/* Create sigrok device instance. */ /* Create sigrok device instance. */
sdi = dev_inst_new(device_index); sdi = dev_inst_new();
if (!sdi) { if (!sdi) {
sr_usb_dev_inst_free(usb); sr_usb_dev_inst_free(usb);
continue; continue;
@ -166,6 +168,7 @@ static GSList *scan(GSList *options)
sdi->driver = di; sdi->driver = di;
sdi->inst_type = SR_INST_USB; sdi->inst_type = SR_INST_USB;
sdi->conn = usb; sdi->conn = usb;
sdi->connection_id = g_strdup(connection_id);
/* Register device instance with driver. */ /* Register device instance with driver. */
drvc->instances = g_slist_append(drvc->instances, sdi); drvc->instances = g_slist_append(drvc->instances, sdi);