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

serial-dmm: Use std_dev_clear().

This commit is contained in:
Uwe Hermann 2013-05-10 18:53:42 +02:00
parent 9790079961
commit 3f0513bac1
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hardware/serial-dmm/api.c
View File

@ -192,35 +192,9 @@ SR_PRIV struct dmm_info dmms[] = {
}, },
}; };
/* Properly close and free all devices. */
static int clear_instances(int dmm) static int clear_instances(int dmm)
{ {
struct sr_dev_inst *sdi; return std_dev_clear(dmms[dmm].di, NULL);
struct drv_context *drvc;
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
GSList *l;
struct sr_dev_driver *di;
di = dmms[dmm].di;
if (!(drvc = di->priv))
return SR_OK;
drvc = di->priv;
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 dmm) static int hw_init(struct sr_context *sr_ctx, int dmm)
@ -380,9 +354,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
static int hw_cleanup(int dmm) static int hw_cleanup(int dmm)
{ {
clear_instances(dmm); return clear_instances(dmm);
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)