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

mic-985xx: Use std_dev_clear().

This commit is contained in:
Uwe Hermann 2013-05-10 17:54:53 +02:00
parent 2a052cc4d6
commit 25e7adada7
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hardware/mic-985xx/api.c
View File

@ -51,32 +51,7 @@ SR_PRIV const struct mic_dev_info mic_devs[] = {
static int clear_instances(int idx) static int clear_instances(int idx)
{ {
struct sr_dev_inst *sdi; return std_dev_clear(mic_devs[idx].di, NULL);
struct drv_context *drvc;
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
GSList *l;
struct sr_dev_driver *di;
di = mic_devs[idx].di;
if (!(drvc = di->priv))
return SR_OK;
for (l = drvc->instances; l; l = l->next) {
if (!(sdi = l->data))
continue;
if (!(devc = sdi->priv))
continue;
serial = sdi->conn;
sr_serial_dev_inst_free(serial);
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, int idx) static int hw_init(struct sr_context *sr_ctx, int idx)
@ -210,9 +185,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
static int hw_cleanup(int idx) static int hw_cleanup(int idx)
{ {
clear_instances(idx); return clear_instances(idx);
return SR_OK;
} }
static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)