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

fluke-dmm: Use std_dev_clear().

This commit is contained in:
Uwe Hermann 2013-05-31 14:20:34 +02:00
parent 732899f8cf
commit 771bd216fa
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,33 +58,9 @@ static const struct flukedmm_profile supported_flukedmm[] = {
{ FLUKE_190, "199B", 1000, 3500 }, { FLUKE_190, "199B", 1000, 3500 },
}; };
/* 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;
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 init(struct sr_context *sr_ctx) static int init(struct sr_context *sr_ctx)
@ -159,6 +135,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
return NULL; return NULL;
} }
devc->profile = &supported_flukedmm[i]; devc->profile = &supported_flukedmm[i];
sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial; sdi->conn = serial;
sdi->priv = devc; sdi->priv = devc;
sdi->driver = di; sdi->driver = di;
@ -253,10 +230,7 @@ static int dev_close(struct sr_dev_inst *sdi)
static int cleanup(void) static int cleanup(void)
{ {
return clear_instances();
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)