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

session_driver: Fix return codes, cosmetics.

This commit is contained in:
Uwe Hermann 2013-05-10 20:31:25 +02:00
parent 6078d2c996
commit 96ea73db23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
session_driver.c
View File

@ -139,7 +139,7 @@ static int cleanup(void)
static int dev_open(struct sr_dev_inst *sdi) static int dev_open(struct sr_dev_inst *sdi)
{ {
if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdev)))) { if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdev)))) {
sr_err("%s: sdi->priv malloc failed", __func__); sr_err("Device context malloc failed.");
return SR_ERR_MALLOC; return SR_ERR_MALLOC;
} }
@ -161,7 +161,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
break; break;
default: default:
return SR_ERR_ARG; return SR_ERR_NA;
} }
return SR_OK; return SR_OK;
@ -193,8 +193,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
vdev->num_probes = g_variant_get_uint64(data); vdev->num_probes = g_variant_get_uint64(data);
break; break;
default: default:
sr_err("Unknown capability: %d.", id); return SR_ERR_NA;
return SR_ERR;
} }
return SR_OK; return SR_OK;
@ -211,7 +210,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
break; break;
default: default:
return SR_ERR_ARG; return SR_ERR_NA;
} }
return SR_OK; return SR_OK;
@ -262,6 +261,9 @@ SR_PRIV struct sr_dev_driver session_driver = {
.api_version = 1, .api_version = 1,
.init = init, .init = init,
.cleanup = cleanup, .cleanup = cleanup,
.scan = NULL,
.dev_list = NULL,
.dev_clear = NULL,
.config_get = config_get, .config_get = config_get,
.config_set = config_set, .config_set = config_set,
.config_list = config_list, .config_list = config_list,
@ -269,4 +271,5 @@ SR_PRIV struct sr_dev_driver session_driver = {
.dev_close = NULL, .dev_close = NULL,
.dev_acquisition_start = dev_acquisition_start, .dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = NULL, .dev_acquisition_stop = NULL,
.priv = NULL,
}; };