X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=435d46af6dee27ed001f73d45910b458c49e145e;hb=d1056603a00b92d12170e6e7d3da33473147c5f5;hp=dfde8d799264f734e8d8c1b0450c294350981b63;hpb=1953564a96798bc298d1c94eb90c129adbde1c9e;p=libsigrok.git diff --git a/session_driver.c b/session_driver.c index dfde8d79..435d46af 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 @@ -26,14 +26,14 @@ #include "libsigrok.h" #include "libsigrok-internal.h" -/* Message logging helpers with driver-specific prefix string. */ -#define DRIVER_LOG_DOMAIN "virtual-session: " -#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args) -#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args) -#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args) -#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args) -#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args) -#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args) +/* Message logging helpers with subsystem-specific prefix string. */ +#define LOG_PREFIX "virtual-session: " +#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) +#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) +#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) +#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) +#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) +#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args) /* size of payloads sent across the session bus */ /** @cond PRIVATE */ @@ -115,16 +115,16 @@ static int receive_data(int fd, int revents, void *cb_data) } /* driver callbacks */ -static int hw_cleanup(void); +static int cleanup(void); -static int hw_init(struct sr_context *sr_ctx) +static int init(struct sr_context *sr_ctx) { (void)sr_ctx; return SR_OK; } -static int hw_cleanup(void) +static int cleanup(void) { GSList *l; @@ -136,10 +136,10 @@ static int hw_cleanup(void) return SR_OK; } -static int hw_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)))) { - sr_err("%s: sdi->priv malloc failed", __func__); + sr_err("Device context malloc failed."); return SR_ERR_MALLOC; } @@ -148,74 +148,78 @@ static int hw_dev_open(struct sr_dev_inst *sdi) return SR_OK; } -static int hw_info_get(int info_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 (info_id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_CUR_SAMPLERATE: + switch (id) { + case SR_CONF_SAMPLERATE: if (sdi) { vdev = sdi->priv; - *data = &vdev->samplerate; + *data = g_variant_new_uint64(vdev->samplerate); } else return SR_ERR; break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; } -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value) +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 (hwcap) { + 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.", hwcap); - return SR_ERR; + return SR_ERR_NA; + } + + 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_NA; } return SR_OK; } -static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) +static int 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; @@ -241,28 +245,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, LOG_PREFIX); - g_free(header); - g_free(packet); + /* freewheeling source */ + sr_session_source_add(-1, 0, 0, receive_data, cb_data); return SR_OK; } @@ -272,12 +259,17 @@ SR_PRIV struct sr_dev_driver session_driver = { .name = "virtual-session", .longname = "Session-emulating driver", .api_version = 1, - .init = hw_init, - .cleanup = hw_cleanup, - .dev_open = hw_dev_open, + .init = init, + .cleanup = cleanup, + .scan = NULL, + .dev_list = NULL, + .dev_clear = NULL, + .config_get = config_get, + .config_set = config_set, + .config_list = config_list, + .dev_open = dev_open, .dev_close = NULL, - .info_get = hw_info_get, - .dev_config_set = hw_dev_config_set, - .dev_acquisition_start = hw_dev_acquisition_start, + .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = NULL, + .priv = NULL, };