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

hantek-dso: Use std_dev_clear()

This commit is contained in:
Bert Vermeulen 2013-04-17 00:49:18 +02:00
parent 72f9d6dc5e
commit 949b3dc091
1 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hardware/hantek-dso/api.c
View File

@ -230,38 +230,19 @@ static int configure_probes(const struct sr_dev_inst *sdi)
return SR_OK; return SR_OK;
} }
/* Properly close and free all devices. */ static void clear_dev_context(void *priv)
{
struct dev_context *devc;
devc = priv;
g_free(devc->triggersource);
g_slist_free(devc->enabled_probes);
}
static int clear_instances(void) static int clear_instances(void)
{ {
struct sr_dev_inst *sdi; return std_dev_clear(di, clear_dev_context);
struct drv_context *drvc;
struct dev_context *devc;
GSList *l;
drvc = di->priv;
for (l = drvc->instances; l; l = l->next) {
if (!(sdi = l->data)) {
/* Log error, but continue cleaning up the rest. */
sr_err("%s: sdi was NULL, continuing", __func__);
continue;
}
if (!(devc = sdi->priv)) {
/* Log error, but continue cleaning up the rest. */
sr_err("%s: sdi->priv was NULL, continuing", __func__);
continue;
}
dso_close(sdi);
sr_usb_dev_inst_free(sdi->conn);
g_free(devc->triggersource);
g_slist_free(devc->enabled_probes);
sr_dev_inst_free(sdi);
}
g_slist_free(drvc->instances);
drvc->instances = NULL;
return SR_OK;
} }
static int hw_init(struct sr_context *sr_ctx) static int hw_init(struct sr_context *sr_ctx)