X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=2eec591d9a13c3fd24dea183754768a4e8805df7;hb=115f82939661da6ad2d26d5ceca709bbc0ad25b5;hp=e4f6a9f424dfcdfdbe82d8a6642e44d9f55f92e8;hpb=123e13138385055003cb6bc09e74df783df5af85;p=libsigrok.git diff --git a/session_driver.c b/session_driver.c index e4f6a9f4..2eec591d 100644 --- a/session_driver.c +++ b/session_driver.c @@ -1,7 +1,7 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * - * Copyright (C) 2010-2012 Bert Vermeulen + * Copyright (C) 2013 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -148,18 +148,15 @@ static int hw_dev_open(struct sr_dev_inst *sdi) return SR_OK; } -static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) { struct session_vdev *vdev; switch (id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; case SR_CONF_SAMPLERATE: if (sdi) { vdev = sdi->priv; - *data = &vdev->samplerate; + *data = g_variant_new_uint64(vdev->samplerate); } else return SR_ERR; break; @@ -170,34 +167,30 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) return SR_OK; } -static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) { struct session_vdev *vdev; - const uint64_t *tmp_u64; vdev = sdi->priv; switch (id) { case SR_CONF_SAMPLERATE: - tmp_u64 = value; - vdev->samplerate = *tmp_u64; + vdev->samplerate = g_variant_get_uint64(data); sr_info("Setting samplerate to %" PRIu64 ".", vdev->samplerate); break; case SR_CONF_SESSIONFILE: - vdev->sessionfile = g_strdup(value); + vdev->sessionfile = g_strdup(g_variant_get_string(data, NULL)); sr_info("Setting sessionfile to '%s'.", vdev->sessionfile); break; case SR_CONF_CAPTUREFILE: - vdev->capturefile = g_strdup(value); + vdev->capturefile = g_strdup(g_variant_get_string(data, NULL)); sr_info("Setting capturefile to '%s'.", vdev->capturefile); break; case SR_CONF_CAPTURE_UNITSIZE: - tmp_u64 = value; - vdev->unitsize = *tmp_u64; + vdev->unitsize = g_variant_get_uint64(data); break; case SR_CONF_CAPTURE_NUM_PROBES: - tmp_u64 = value; - vdev->num_probes = *tmp_u64; + vdev->num_probes = g_variant_get_uint64(data); break; default: sr_err("Unknown capability: %d.", id); @@ -207,13 +200,28 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) return SR_OK; } +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) +{ + + (void)sdi; + + switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t)); + break; + default: + return SR_ERR_ARG; + } + + return SR_OK; +} + static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { struct zip_stat zs; struct session_vdev *vdev; - struct sr_datafeed_header *header; - struct sr_datafeed_packet *packet; int ret; vdev = sdi->priv; @@ -239,28 +247,11 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, return SR_ERR; } - /* freewheeling source */ - sr_session_source_add(-1, 0, 0, receive_data, cb_data); - - if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) { - sr_err("%s: packet malloc failed", __func__); - return SR_ERR_MALLOC; - } - - if (!(header = g_try_malloc(sizeof(struct sr_datafeed_header)))) { - sr_err("%s: header malloc failed", __func__); - return SR_ERR_MALLOC; - } - /* Send header packet to the session bus. */ - packet->type = SR_DF_HEADER; - packet->payload = (unsigned char *)header; - header->feed_version = 1; - gettimeofday(&header->starttime, NULL); - sr_session_send(cb_data, packet); + std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); - g_free(header); - g_free(packet); + /* freewheeling source */ + sr_session_source_add(-1, 0, 0, receive_data, cb_data); return SR_OK; } @@ -274,6 +265,7 @@ SR_PRIV struct sr_dev_driver session_driver = { .cleanup = hw_cleanup, .config_get = config_get, .config_set = config_set, + .config_list = config_list, .dev_open = hw_dev_open, .dev_close = NULL, .dev_acquisition_start = hw_dev_acquisition_start,