X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fsession_driver.c;h=79383cc719fb011aab5758b1ad471d64324abb0b;hp=6befa780ece2b88492abc699a2ab8b266a3168c1;hb=22fdb67fa0714c11cc0a58ee1423f55d18a4f080;hpb=2c38a41a60b8ebb8137d3b5b14ae652c66af6034 diff --git a/src/session_driver.c b/src/session_driver.c index 6befa780..79383cc7 100644 --- a/src/session_driver.c +++ b/src/session_driver.c @@ -31,7 +31,7 @@ /* size of payloads sent across the session bus */ /** @cond PRIVATE */ -#define CHUNKSIZE (512 * 1024) +#define CHUNKSIZE (4 * 1024 * 1024) /** @endcond */ SR_PRIV struct sr_dev_driver session_driver_info; @@ -44,7 +44,10 @@ struct session_vdev { int bytes_read; uint64_t samplerate; int unitsize; - int num_channels; + int num_logic_channels; + int num_analog_channels; + int cur_analog_channel; + GArray *analog_channels; int cur_chunk; gboolean finished; }; @@ -53,6 +56,7 @@ static const uint32_t devopts[] = { SR_CONF_CAPTUREFILE | SR_CONF_SET, SR_CONF_CAPTURE_UNITSIZE | SR_CONF_GET | SR_CONF_SET, SR_CONF_NUM_LOGIC_CHANNELS | SR_CONF_SET, + SR_CONF_NUM_ANALOG_CHANNELS | SR_CONF_SET, SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET, SR_CONF_SESSIONFILE | SR_CONF_SET, }; @@ -62,17 +66,22 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi) struct session_vdev *vdev; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; + struct sr_datafeed_analog analog; + struct sr_analog_encoding encoding; + struct sr_analog_meaning meaning; + struct sr_analog_spec spec; struct zip_stat zs; int ret, got_data; - char capturefile[16]; + char capturefile[128]; void *buf; got_data = FALSE; vdev = sdi->priv; + if (!vdev->capfile) { /* No capture file opened yet, or finished with the last * chunked one. */ - if (vdev->cur_chunk == 0) { + if (vdev->capturefile && (vdev->cur_chunk == 0)) { /* capturefile is always the unchunked base name. */ if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) != -1) { /* No chunks, just a single capture file. */ @@ -83,7 +92,7 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi) sr_dbg("Opened %s.", vdev->capturefile); } else { /* Try as first chunk filename. */ - snprintf(capturefile, 15, "%s-1", vdev->capturefile); + snprintf(capturefile, sizeof(capturefile) - 1, "%s-1", vdev->capturefile); if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) { vdev->cur_chunk = 1; if (!(vdev->capfile = zip_fopen(vdev->archive, @@ -99,15 +108,33 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi) } else { /* Capture data is chunked, advance to the next chunk. */ vdev->cur_chunk++; - snprintf(capturefile, 15, "%s-%d", vdev->capturefile, + snprintf(capturefile, sizeof(capturefile) - 1, "%s-%d", vdev->capturefile, vdev->cur_chunk); if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) { if (!(vdev->capfile = zip_fopen(vdev->archive, capturefile, 0))) return FALSE; sr_dbg("Opened %s.", capturefile); + } else if (vdev->cur_analog_channel < vdev->num_analog_channels) { + vdev->capturefile = g_strdup_printf("analog-1-%d", + vdev->num_logic_channels + vdev->cur_analog_channel + 1); + vdev->cur_analog_channel++; + vdev->cur_chunk = 0; + return TRUE; } else { /* We got all the chunks, finish up. */ + g_free(vdev->capturefile); + + /* If the file has logic channels, the initial value for + * capturefile is set by stream_session_data() - however only + * once. In order to not mess this mechanism up, we simulate + * this here if needed. For purely analog files, capturefile + * is not set. + */ + if (vdev->num_logic_channels) + vdev->capturefile = g_strdup("logic-1"); + else + vdev->capturefile = NULL; return FALSE; } } @@ -115,20 +142,49 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi) buf = g_malloc(CHUNKSIZE); - ret = zip_fread(vdev->capfile, buf, - CHUNKSIZE / vdev->unitsize * vdev->unitsize); + /* unitsize is not defined for purely analog session files. */ + if (vdev->unitsize) + ret = zip_fread(vdev->capfile, buf, + CHUNKSIZE / vdev->unitsize * vdev->unitsize); + else + ret = zip_fread(vdev->capfile, buf, CHUNKSIZE); + if (ret > 0) { - if (ret % vdev->unitsize != 0) - sr_warn("Read size %d not a multiple of the" - " unit size %d.", ret, vdev->unitsize); - got_data = TRUE; - packet.type = SR_DF_LOGIC; - packet.payload = &logic; - logic.length = ret; - logic.unitsize = vdev->unitsize; - logic.data = buf; - vdev->bytes_read += ret; - sr_session_send(sdi, &packet); + if (vdev->cur_analog_channel != 0) { + got_data = TRUE; + packet.type = SR_DF_ANALOG; + packet.payload = &analog; + /* TODO: Use proper 'digits' value for this device (and its modes). */ + sr_analog_init(&analog, &encoding, &meaning, &spec, 2); + analog.meaning->channels = g_slist_prepend(NULL, + g_array_index(vdev->analog_channels, + struct sr_channel *, vdev->cur_analog_channel - 1)); + analog.num_samples = ret / sizeof(float); + analog.meaning->mq = SR_MQ_VOLTAGE; + analog.meaning->unit = SR_UNIT_VOLT; + analog.meaning->mqflags = SR_MQFLAG_DC; + analog.data = (float *) buf; + } else if (vdev->unitsize) { + got_data = TRUE; + if (ret % vdev->unitsize != 0) + sr_warn("Read size %d not a multiple of the" + " unit size %d.", ret, vdev->unitsize); + packet.type = SR_DF_LOGIC; + packet.payload = &logic; + logic.length = ret; + logic.unitsize = vdev->unitsize; + logic.data = buf; + } else { + /* + * Neither analog data, nor logic which has + * unitsize, must be an unexpected API use. + */ + sr_warn("Neither analog nor logic data. Ignoring."); + } + if (got_data) { + vdev->bytes_read += ret; + sr_session_send(sdi, &packet); + } } else { /* done with this capture file */ zip_fclose(vdev->capfile); @@ -148,7 +204,6 @@ static int receive_data(int fd, int revents, void *cb_data) { struct sr_dev_inst *sdi; struct session_vdev *vdev; - struct sr_datafeed_packet packet; (void)fd; (void)revents; @@ -169,34 +224,14 @@ static int receive_data(int fd, int revents, void *cb_data) zip_discard(vdev->archive); vdev->archive = NULL; } - packet.type = SR_DF_END; - packet.payload = NULL; - sr_session_send(sdi, &packet); + + std_session_send_df_end(sdi); return G_SOURCE_REMOVE; } /* driver callbacks */ -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(sr_ctx, di, LOG_PREFIX); -} - -static int dev_clear(const struct sr_dev_driver *di) -{ - struct drv_context *drvc; - GSList *l; - - drvc = di->context; - for (l = drvc->instances; l; l = l->next) - sr_dev_inst_free(l->data); - g_slist_free(drvc->instances); - drvc->instances = NULL; - - return SR_OK; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di; @@ -224,8 +259,8 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_get(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct session_vdev *vdev; @@ -250,8 +285,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return SR_OK; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct session_vdev *vdev; @@ -278,7 +313,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd vdev->unitsize = g_variant_get_uint64(data); break; case SR_CONF_NUM_LOGIC_CHANNELS: - vdev->num_channels = g_variant_get_int32(data); + vdev->num_logic_channels = g_variant_get_int32(data); + break; + case SR_CONF_NUM_ANALOG_CHANNELS: + vdev->num_analog_channels = g_variant_get_int32(data); break; default: return SR_ERR_NA; @@ -287,33 +325,29 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return SR_OK; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +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, NO_OPTS, NO_OPTS, devopts); } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct session_vdev *vdev; int ret; - - (void)cb_data; + GSList *l; + struct sr_channel *ch; vdev = sdi->priv; vdev->bytes_read = 0; + vdev->cur_analog_channel = 0; + vdev->analog_channels = g_array_sized_new(FALSE, FALSE, + sizeof(struct sr_channel *), vdev->num_analog_channels); + for (l = sdi->channels; l; l = l->next) { + ch = l->data; + if (ch->type == SR_CHANNEL_ANALOG) + g_array_append_val(vdev->analog_channels, ch); + } vdev->cur_chunk = 0; vdev->finished = FALSE; @@ -326,8 +360,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_ERR; } - /* Send header packet to the session bus. */ - std_session_send_df_header(sdi, LOG_PREFIX); + std_session_send_df_header(sdi); /* freewheeling source */ sr_session_source_add(sdi->session, -1, 0, 0, receive_data, (void *)sdi); @@ -335,11 +368,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) +static int dev_acquisition_stop(struct sr_dev_inst *sdi) { struct session_vdev *vdev; - (void)cb_data; vdev = sdi->priv; vdev->finished = TRUE; @@ -352,11 +384,11 @@ SR_PRIV struct sr_dev_driver session_driver = { .name = "virtual-session", .longname = "Session-emulating driver", .api_version = 1, - .init = init, - .cleanup = dev_clear, + .init = std_init, + .cleanup = std_cleanup, .scan = NULL, .dev_list = NULL, - .dev_clear = dev_clear, + .dev_clear = std_dev_clear, .config_get = config_get, .config_set = config_set, .config_list = config_list,