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

lascar-el-usb: Use std_dev_clear().

This commit is contained in:
Uwe Hermann 2013-05-31 14:25:33 +02:00
parent 771bd216fa
commit c9d622a420
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hardware/lascar-el-usb/api.c
View File

@ -26,7 +26,6 @@
SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address); SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address);
SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info; SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
static struct sr_dev_driver *di = &lascar_el_usb_driver_info; static struct sr_dev_driver *di = &lascar_el_usb_driver_info;
static int dev_close(struct sr_dev_inst *sdi);
static const int32_t hwopts[] = { static const int32_t hwopts[] = {
SR_CONF_CONN, SR_CONF_CONN,
@ -39,32 +38,9 @@ static const int32_t hwcaps[] = {
SR_CONF_LIMIT_SAMPLES, SR_CONF_LIMIT_SAMPLES,
}; };
/* 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;
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;
dev_close(sdi);
sr_usb_dev_inst_free(sdi->conn);
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)
@ -173,17 +149,18 @@ static int dev_close(struct sr_dev_inst *sdi)
static int cleanup(void) static int cleanup(void)
{ {
int ret;
struct drv_context *drvc; struct drv_context *drvc;
if (!(drvc = di->priv)) if (!(drvc = di->priv))
/* Can get called on an unused driver, doesn't matter. */ /* Can get called on an unused driver, doesn't matter. */
return SR_OK; return SR_OK;
clear_instances(); ret = clear_instances();
g_free(drvc); g_free(drvc);
di->priv = NULL; di->priv = NULL;
return SR_OK; return ret;
} }
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)