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

brymen-dmm: Use std_dev_clear().

This commit is contained in:
Uwe Hermann 2013-05-31 14:00:30 +02:00
parent adf33ecce5
commit 40bbc64293
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/brymen-dmm/api.c
View File

@ -39,31 +39,9 @@ static int init(struct sr_context *sr_ctx)
return std_hw_init(sr_ctx, di, LOG_PREFIX); return std_hw_init(sr_ctx, di, LOG_PREFIX);
} }
static void free_instance(void *inst)
{
struct sr_dev_inst *sdi;
struct sr_serial_dev_inst *serial;
if (!(sdi = inst))
return;
serial = sdi->conn;
sr_serial_dev_inst_free(serial);
sr_dev_inst_free(sdi);
}
/* Properly close and free all devices. */
static int clear_instances(void) static int clear_instances(void)
{ {
struct drv_context *drvc; return std_dev_clear(di, NULL);
if (!(drvc = di->priv))
return SR_OK;
g_slist_free_full(drvc->instances, free_instance);
drvc->instances = NULL;
return SR_OK;
} }
static GSList *brymen_scan(const char *conn, const char *serialcomm) static GSList *brymen_scan(const char *conn, const char *serialcomm)
@ -199,9 +177,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)