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

ols/link-mso19: Consistency fixes. 

Use the same setup/ordering/naming for the cleanup/dev_clear functions
as all other drivers do.
This commit is contained in:
Uwe Hermann 2013-06-02 16:54:31 +02:00
parent 1c2d542df2
commit eea49cf10d
2 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
hardware/link-mso19/api.c
View File

@ -51,6 +51,44 @@ static const uint64_t samplerates[] = {
SR_PRIV struct sr_dev_driver link_mso19_driver_info;
static struct sr_dev_driver *di = &link_mso19_driver_info;
static int dev_close(struct sr_dev_inst *sdi);
/* TODO: Use sr_dev_inst to store connection handle & use std_dev_clear(). */
static int dev_clear(void)
{
GSList *l;
struct sr_dev_inst *sdi;
struct drv_context *drvc;
struct dev_context *devc;
int ret = SR_OK;
if (!(drvc = di->priv))
return SR_OK;
/* Properly close and free all devices. */
for (l = drvc->instances; l; l = l->next) {
if (!(sdi = l->data)) {
/* Log error, but continue cleaning up the rest. */
sr_err("%s: sdi was NULL, continuing", __func__);
ret = SR_ERR_BUG;
continue;
}
if (!(devc = sdi->priv)) {
/* Log error, but continue cleaning up the rest. */
sr_err("%s: sdi->priv was NULL, continuing", __func__);
ret = SR_ERR_BUG;
continue;
}
dev_close(sdi);
sr_serial_dev_inst_free(devc->serial);
sr_dev_inst_free(sdi);
}
g_slist_free(drvc->instances);
drvc->instances = NULL;
return ret;
}
static int init(struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
@ -250,37 +288,7 @@ static int dev_close(struct sr_dev_inst *sdi)
static int cleanup(void)
{
GSList *l;
struct sr_dev_inst *sdi;
struct drv_context *drvc;
struct dev_context *devc;
int ret = SR_OK;
if (!(drvc = di->priv))
return SR_OK;
/* Properly close and free all devices. */
for (l = drvc->instances; l; l = l->next) {
if (!(sdi = l->data)) {
/* Log error, but continue cleaning up the rest. */
sr_err("%s: sdi was NULL, continuing", __func__);
ret = SR_ERR_BUG;
continue;
}
if (!(devc = sdi->priv)) {
/* Log error, but continue cleaning up the rest. */
sr_err("%s: sdi->priv was NULL, continuing", __func__);
ret = SR_ERR_BUG;
continue;
}
dev_close(sdi);
sr_serial_dev_inst_free(devc->serial);
sr_dev_inst_free(sdi);
}
g_slist_free(drvc->instances);
drvc->instances = NULL;
return ret;
return dev_clear();
}
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
@ -481,7 +489,7 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
.cleanup = cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = cleanup,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,

11
hardware/openbench-logic-sniffer/api.c
View File

@ -53,6 +53,11 @@ static const uint64_t samplerates[] = {
SR_PRIV struct sr_dev_driver ols_driver_info;
static struct sr_dev_driver *di = &ols_driver_info;
static int dev_clear(void)
{
return std_dev_clear(di, NULL);
}
static int init(struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
@ -207,9 +212,9 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
static int dev_clear(void)
static int cleanup(void)
{
return std_dev_clear(di, NULL);
return dev_clear();
}
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
@ -474,7 +479,7 @@ SR_PRIV struct sr_dev_driver ols_driver_info = {
.longname = "Openbench Logic Sniffer",
.api_version = 1,
.init = init,
.cleanup = dev_clear,
.cleanup = cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,