#include <fcntl.h>
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
#endif
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
/* TODO: Number of probes should be configurable. */
#define NUM_PROBES 8
};
/* FIXME: Should not be global. */
-SR_PRIV GIOChannel *channels[2];
-struct databag {
+struct context {
int pipe_fds[2];
+ GIOChannel *channels[2];
uint8_t sample_generator;
uint8_t thread_running;
uint64_t samples_counter;
GTimer *timer;
};
-static int hwcaps[] = {
+static const int hwcaps[] = {
SR_HWCAP_LOGIC_ANALYZER,
SR_HWCAP_DEMO_DEV,
SR_HWCAP_SAMPLERATE,
SR_HWCAP_CONTINUOUS,
};
-static struct sr_samplerates samplerates = {
+static const struct sr_samplerates samplerates = {
SR_HZ(1),
SR_GHZ(1),
SR_HZ(1),
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;
}
-static int hw_dev_config_set(int dev_index, int hwcap, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
{
int ret;
- char *stropt;
+ const char *stropt;
/* Avoid compiler warnings. */
(void)dev_index;
/* Nothing to do, but must be supported */
ret = SR_OK;
} else if (hwcap == SR_HWCAP_SAMPLERATE) {
- cur_samplerate = *(uint64_t *)value;
+ cur_samplerate = *(const uint64_t *)value;
sr_dbg("demo: %s: setting samplerate to %" PRIu64, __func__,
cur_samplerate);
ret = SR_OK;
} else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
- limit_samples = *(uint64_t *)value;
+ limit_msec = 0;
+ limit_samples = *(const uint64_t *)value;
sr_dbg("demo: %s: setting limit_samples to %" PRIu64, __func__,
limit_samples);
ret = SR_OK;
} else if (hwcap == SR_HWCAP_LIMIT_MSEC) {
- limit_msec = *(uint64_t *)value;
+ limit_msec = *(const uint64_t *)value;
+ limit_samples = 0;
sr_dbg("demo: %s: setting limit_msec to %" PRIu64, __func__,
limit_msec);
ret = SR_OK;
static void samples_generator(uint8_t *buf, uint64_t size, void *data)
{
static uint64_t p = 0;
- struct databag *ctx = data;
+ struct context *ctx = data;
uint64_t i;
/* TODO: Needed? */
/* Thread function */
static void thread_func(void *data)
{
- struct databag *ctx = data;
+ struct context *ctx = data;
uint8_t buf[BUFSIZE];
uint64_t nb_to_send = 0;
int bytes_written;
samples_generator(buf, nb_to_send, data);
ctx->samples_counter += nb_to_send;
- g_io_channel_write_chars(channels[1], (gchar *)&buf,
+ g_io_channel_write_chars(ctx->channels[1], (gchar *)&buf,
nb_to_send, (gsize *)&bytes_written, NULL);
}
/* Callback handling data */
static int receive_data(int fd, int revents, void *cb_data)
{
+ struct context *ctx = cb_data;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
static uint64_t samples_received = 0;
(void)revents;
do {
- g_io_channel_read_chars(channels[0],
+ g_io_channel_read_chars(ctx->channels[0],
(gchar *)&c, BUFSIZE, &z, NULL);
if (z > 0) {
logic.length = z;
logic.unitsize = 1;
logic.data = c;
- sr_session_send(cb_data, &packet);
+ sr_session_send(ctx->session_dev_id, &packet);
samples_received += z;
}
} while (z > 0);
if (!thread_running && z <= 0) {
/* Make sure we don't receive more packets. */
- g_io_channel_close(channels[0]);
+ g_io_channel_shutdown(ctx->channels[0], FALSE, NULL);
/* Send last packet. */
packet.type = SR_DF_END;
- sr_session_send(cb_data, &packet);
+ sr_session_send(ctx->session_dev_id, &packet);
return FALSE;
}
{
struct sr_datafeed_packet *packet;
struct sr_datafeed_header *header;
- struct databag *ctx;
+ struct sr_datafeed_meta_logic meta;
+ struct context *ctx;
/* TODO: 'ctx' is never g_free()'d? */
- if (!(ctx = g_try_malloc(sizeof(struct databag)))) {
+ if (!(ctx = g_try_malloc(sizeof(struct context)))) {
sr_err("demo: %s: ctx malloc failed", __func__);
return SR_ERR_MALLOC;
}
return SR_ERR;
}
- channels[0] = g_io_channel_unix_new(ctx->pipe_fds[0]);
- channels[1] = g_io_channel_unix_new(ctx->pipe_fds[1]);
+ ctx->channels[0] = g_io_channel_unix_new(ctx->pipe_fds[0]);
+ ctx->channels[1] = g_io_channel_unix_new(ctx->pipe_fds[1]);
+
+ g_io_channel_set_flags(ctx->channels[0], G_IO_FLAG_NONBLOCK, NULL);
/* Set channel encoding to binary (default is UTF-8). */
- g_io_channel_set_encoding(channels[0], NULL, NULL);
- g_io_channel_set_encoding(channels[1], NULL, NULL);
+ g_io_channel_set_encoding(ctx->channels[0], NULL, NULL);
+ g_io_channel_set_encoding(ctx->channels[1], NULL, NULL);
/* Make channels to unbuffered. */
- g_io_channel_set_buffered(channels[0], FALSE);
- g_io_channel_set_buffered(channels[1], FALSE);
+ g_io_channel_set_buffered(ctx->channels[0], FALSE);
+ g_io_channel_set_buffered(ctx->channels[1], FALSE);
- sr_source_add(ctx->pipe_fds[0], G_IO_IN | G_IO_ERR, 40,
- receive_data, ctx->session_dev_id);
+ sr_session_source_add_channel(ctx->channels[0], G_IO_IN | G_IO_ERR,
+ 40, receive_data, ctx);
/* Run the demo thread. */
g_thread_init(NULL);
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);