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

colead-slm: Use std_dev_clear().

This commit is contained in:
Uwe Hermann 2013-05-31 14:17:38 +02:00
parent 676c28a846
commit 732899f8cf
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hardware/colead-slm/api.c
View File

@ -45,31 +45,9 @@ static const int32_t hwcaps[] = {
SR_PRIV struct sr_dev_driver colead_slm_driver_info; SR_PRIV struct sr_dev_driver colead_slm_driver_info;
static struct sr_dev_driver *di = &colead_slm_driver_info; static struct sr_dev_driver *di = &colead_slm_driver_info;
/* Properly close and free all devices. */
static int clear_instances(void) static int clear_instances(void)
{ {
struct sr_dev_inst *sdi; return std_dev_clear(di, NULL);
struct drv_context *drvc;
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
GSList *l;
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 init(struct sr_context *sr_ctx) static int init(struct sr_context *sr_ctx)
@ -166,9 +144,7 @@ static int dev_close(struct sr_dev_inst *sdi)
static int cleanup(void) static int cleanup(void)
{ {
clear_instances(); return clear_instances();
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)