X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fapi.c;h=89d12ea9fb3a3fed7110e9ac8aee87d39a09893d;hb=d6fa8ace94ac0c17855c3433cca038a150689495;hp=81756d76aab84edc076d29d6a2683e5b3c37c6a6;hpb=5827f61b641cfd326a9cf2ea534eb4f9481a8187;p=libsigrok.git diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c index 81756d76..89d12ea9 100644 --- a/src/hardware/ikalogic-scanalogic2/api.c +++ b/src/hardware/ikalogic-scanalogic2/api.c @@ -69,7 +69,7 @@ static GSList *scan(GSList *options) struct dev_context *devc; struct sr_usb_dev_inst *usb; struct device_info dev_info; - int ret, device_index, i; + int ret, i; char *fw_ver_str; (void)options; @@ -77,7 +77,6 @@ static GSList *scan(GSList *options) devices = NULL; drvc = di->priv; drvc->instances = NULL; - device_index = 0; usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, USB_VID_PID); @@ -125,7 +124,7 @@ static GSList *scan(GSList *options) continue; } - sdi = sr_dev_inst_new(device_index, SR_ST_INACTIVE, VENDOR_NAME, + sdi = sr_dev_inst_new(SR_ST_INACTIVE, VENDOR_NAME, MODEL_NAME, fw_ver_str); g_free(fw_ver_str); if (!sdi) { @@ -141,6 +140,7 @@ static GSList *scan(GSList *options) sdi->driver = di; sdi->inst_type = SR_INST_USB; sdi->conn = usb; + sdi->serial_num = g_strdup_printf("%d", dev_info.serial); for (i = 0; channel_names[i]; i++) { ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, @@ -182,8 +182,6 @@ static GSList *scan(GSList *options) drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); - - device_index++; } g_slist_free(usb_devices);