X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsession_driver.c;h=a5f2e36862681511518e5e9d77603f7edb129ae8;hb=f8195cb2da3268c89e24071ed32ab9acdded5bc0;hp=97d75413b9bcd8b360f043f51ce7c3c07d38044e;hpb=029b20425b618147f502856cdd0f55a1d5536dbd;p=libsigrok.git diff --git a/src/session_driver.c b/src/session_driver.c index 97d75413..a5f2e368 100644 --- a/src/session_driver.c +++ b/src/session_driver.c @@ -319,19 +319,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - (void)sdi; - (void)cg; - - switch (key) { - case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; - default: - return SR_ERR_NA; - } - - return SR_OK; + return STD_CONFIG_LIST(key, data, sdi, cg, NULL, NULL, devopts); } static int dev_acquisition_start(const struct sr_dev_inst *sdi) @@ -388,7 +376,7 @@ SR_PRIV struct sr_dev_driver session_driver = { .longname = "Session-emulating driver", .api_version = 1, .init = std_init, - .cleanup = std_dev_clear, + .cleanup = std_cleanup, .scan = NULL, .dev_list = NULL, .dev_clear = std_dev_clear,