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

scpi: Move closing of discovered devices to sr_scpi_scan_resource().

This commit is contained in:
Martin Ling 2015-10-24 22:27:45 +01:00 committed by Uwe Hermann
parent b7b873cea3
commit a00106b7f8
6 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hardware/gwinstek-gds-800/api.c
View File

@ -57,7 +57,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
} }
sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_ACTIVE;
sdi->vendor = g_strdup(hw_info->manufacturer); sdi->vendor = g_strdup(hw_info->manufacturer);
sdi->model = g_strdup(hw_info->model); sdi->model = g_strdup(hw_info->model);
sdi->version = g_strdup(hw_info->firmware_version); sdi->version = g_strdup(hw_info->firmware_version);

5
src/hardware/hameg-hmo/api.c
View File

@ -81,7 +81,6 @@ static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi
goto fail; goto fail;
sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_ACTIVE;
sdi->vendor = g_strdup(hw_info->manufacturer); sdi->vendor = g_strdup(hw_info->manufacturer);
sdi->model = g_strdup(hw_info->model); sdi->model = g_strdup(hw_info->model);
sdi->version = g_strdup(hw_info->firmware_version); sdi->version = g_strdup(hw_info->firmware_version);
@ -100,10 +99,6 @@ static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi
if (hmo_init_device(sdi) != SR_OK) if (hmo_init_device(sdi) != SR_OK)
goto fail; goto fail;
sr_scpi_close(sdi->conn);
sdi->status = SR_ST_INACTIVE;
return sdi; return sdi;
fail: fail:

5
src/hardware/rigol-ds/api.c
View File

@ -313,7 +313,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
} }
sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_ACTIVE;
sdi->vendor = g_strdup(model->series->vendor->name); sdi->vendor = g_strdup(model->series->vendor->name);
sdi->model = g_strdup(model->name); sdi->model = g_strdup(model->name);
sdi->version = g_strdup(hw_info->firmware_version); sdi->version = g_strdup(hw_info->firmware_version);
@ -404,10 +403,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
sdi->priv = devc; sdi->priv = devc;
sdi->status = SR_ST_INACTIVE;
sr_scpi_close(scpi);
return sdi; return sdi;
} }

2
src/hardware/scpi-pps/api.c
View File

@ -91,7 +91,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
} }
sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup(vendor); sdi->vendor = g_strdup(vendor);
sdi->model = g_strdup(hw_info->model); sdi->model = g_strdup(hw_info->model);
sdi->version = g_strdup(hw_info->firmware_version); sdi->version = g_strdup(hw_info->firmware_version);
@ -168,7 +167,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
hw_info = NULL; hw_info = NULL;
scpi_cmd(sdi, devc->device->commands, SCPI_CMD_LOCAL); scpi_cmd(sdi, devc->device->commands, SCPI_CMD_LOCAL);
sr_scpi_close(scpi);
return sdi; return sdi;
} }

4
src/hardware/yokogawa-dlm/api.c
View File

@ -92,7 +92,6 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
goto fail; goto fail;
sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_ACTIVE;
sdi->vendor = g_strdup(MANUFACTURER_NAME); sdi->vendor = g_strdup(MANUFACTURER_NAME);
sdi->model = g_strdup(model_name); sdi->model = g_strdup(model_name);
sdi->version = g_strdup(hw_info->firmware_version); sdi->version = g_strdup(hw_info->firmware_version);
@ -112,9 +111,6 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
if (dlm_device_init(sdi, model_index) != SR_OK) if (dlm_device_init(sdi, model_index) != SR_OK)
goto fail; goto fail;
sr_scpi_close(sdi->conn);
sdi->status = SR_ST_INACTIVE;
return sdi; return sdi;
fail: fail:

12
src/scpi/scpi.c
View File

@ -110,12 +110,16 @@ static struct sr_dev_inst *sr_scpi_scan_resource(struct drv_context *drvc,
return NULL; return NULL;
}; };
if ((sdi = probe_device(scpi))) sdi = probe_device(scpi);
return sdi;
sr_scpi_close(scpi); sr_scpi_close(scpi);
sr_scpi_free(scpi);
return NULL; if (sdi)
sdi->status = SR_ST_INACTIVE;
else
sr_scpi_free(scpi);
return sdi;
} }
SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options, SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,