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

chronovu-la8: Use std_dev_clear().

This commit is contained in:
Uwe Hermann 2013-05-10 18:40:13 +02:00
parent decfe89d4e
commit 9790079961
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hardware/chronovu-la8/api.c
View File

@ -56,32 +56,19 @@ static const uint16_t usb_pids[] = {
/* Function prototypes. */ /* Function prototypes. */
static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
static int clear_instances(void) static void clear_helper(void *priv)
{ {
GSList *l;
struct sr_dev_inst *sdi;
struct drv_context *drvc;
struct dev_context *devc; struct dev_context *devc;
drvc = di->priv; devc = priv;
/* Properly close all devices. */ ftdi_free(devc->ftdic);
for (l = drvc->instances; l; l = l->next) { g_free(devc->final_buf);
if (!(sdi = l->data)) { }
/* Log error, but continue cleaning up the rest. */
sr_err("%s: sdi was NULL, continuing.", __func__);
continue;
}
if (sdi->priv) {
devc = sdi->priv;
ftdi_free(devc->ftdic);
}
sr_dev_inst_free(sdi);
}
g_slist_free(drvc->instances);
drvc->instances = NULL;
return SR_OK; static int clear_instances(void)
{
return std_dev_clear(di, clear_helper);
} }
static int hw_init(struct sr_context *sr_ctx) static int hw_init(struct sr_context *sr_ctx)
@ -267,20 +254,12 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;
g_free(devc->final_buf);
return SR_OK; return SR_OK;
} }
static int hw_cleanup(void) static int hw_cleanup(void)
{ {
if (!di->priv) return clear_instances();
/* Can get called on an unused driver, doesn't matter. */
return SR_OK;
clear_instances();
return SR_OK;
} }
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)