GTimer *timer;
};
-static int hwcaps[] = {
+static const int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
SR_HWCAP_DEMO_DEV,
SR_HWCAP_SAMPLERATE,
return SR_OK;
}
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
{
struct sr_dev_inst *sdi;
- void *info = NULL;
+ const void *info = NULL;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("demo: %s: sdi was NULL", __func__);
case SR_DI_CUR_SAMPLERATE:
info = &cur_samplerate;
break;
- case SR_DI_PATTERNMODES:
+ case SR_DI_PATTERNS:
info = &pattern_strings;
break;
}
return SR_ST_ACTIVE;
}
-static int *hw_hwcap_get_all(void)
+static const int *hw_hwcap_get_all(void)
{
return hwcaps;
}
if (!thread_running && z <= 0) {
/* Make sure we don't receive more packets. */
- g_io_channel_close(channels[0]);
+ g_io_channel_shutdown(channels[0], FALSE, NULL);
/* Send last packet. */
packet.type = SR_DF_END;
{
struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header;
+ struct sr_datafeed_meta_logic meta;
struct context *ctx;
/* TODO: 'ctx' is never g_free()'d? */
packet->payload = header;
header->feed_version = 1;
gettimeofday(&header->starttime, NULL);
- header->samplerate = cur_samplerate;
- header->num_logic_probes = NUM_PROBES;
sr_session_send(ctx->session_dev_id, packet);
+
+ /* Send metadata about the SR_DF_LOGIC packets to come. */
+ packet->type = SR_DF_META_LOGIC;
+ packet->payload = &meta;
+ meta.samplerate = cur_samplerate;
+ meta.num_probes = NUM_PROBES;
+ sr_session_send(ctx->session_dev_id, packet);
+
g_free(header);
g_free(packet);