X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fbinary.c;h=f9e49de17cb84d766b5a59601c569cb490957050;hb=c7bc82ffa1b09a228a8395049e2b691cd7bd85f8;hp=846e6bab6ee2af4d8a510a7bfab0318102f18460;hpb=d4c937749a92ce6defa2f0095b34692181afe597;p=libsigrok.git diff --git a/src/input/binary.c b/src/input/binary.c index 846e6bab..f9e49de1 100644 --- a/src/input/binary.c +++ b/src/input/binary.c @@ -28,124 +28,146 @@ #define LOG_PREFIX "input/binary" -#define CHUNKSIZE (512 * 1024) +#define MAX_CHUNK_SIZE 4096 #define DEFAULT_NUM_CHANNELS 8 +#define DEFAULT_SAMPLERATE 0 struct context { + gboolean started; uint64_t samplerate; }; -static int format_match(const char *filename) -{ - (void)filename; - - /* This module will handle anything you throw at it. */ - return TRUE; -} - -static int init(struct sr_input *in, const char *filename) +static int init(struct sr_input *in, GHashTable *options) { struct sr_channel *ch; + struct context *inc; int num_channels, i; - char name[SR_MAX_CHANNELNAME_LEN + 1]; - char *param; - struct context *ctx; - - (void)filename; + char name[16]; - if (!(ctx = g_try_malloc0(sizeof(*ctx)))) { - sr_err("Input format context malloc failed."); - return SR_ERR_MALLOC; + num_channels = g_variant_get_int32(g_hash_table_lookup(options, "numchannels")); + if (num_channels < 1) { + sr_err("Invalid value for numchannels: must be at least 1."); + return SR_ERR_ARG; } - num_channels = DEFAULT_NUM_CHANNELS; - ctx->samplerate = 0; - - if (in->param) { - param = g_hash_table_lookup(in->param, "numchannels"); - if (param) { - num_channels = strtoul(param, NULL, 10); - if (num_channels < 1) - return SR_ERR; - } - - param = g_hash_table_lookup(in->param, "samplerate"); - if (param) { - if (sr_parse_sizestring(param, &ctx->samplerate) != SR_OK) - return SR_ERR; - } - } + in->sdi = g_malloc0(sizeof(struct sr_dev_inst)); + in->priv = inc = g_malloc0(sizeof(struct context)); - /* Create a virtual device. */ - in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL); - in->internal = ctx; + inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate")); for (i = 0; i < num_channels; i++) { - snprintf(name, SR_MAX_CHANNELNAME_LEN, "%d", i); - /* TODO: Check return value. */ - if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, name))) - return SR_ERR; + snprintf(name, 16, "%d", i); + ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, name); in->sdi->channels = g_slist_append(in->sdi->channels, ch); } return SR_OK; } -static int loadfile(struct sr_input *in, const char *filename) +static int process_buffer(struct sr_input *in) { struct sr_datafeed_packet packet; struct sr_datafeed_meta meta; struct sr_datafeed_logic logic; struct sr_config *src; - unsigned char buffer[CHUNKSIZE]; - int fd, size, num_channels; - struct context *ctx; - - ctx = in->internal; + struct context *inc; + gsize chunk_size, i; + int chunk; + + inc = in->priv; + if (!inc->started) { + std_session_send_df_header(in->sdi, LOG_PREFIX); + + if (inc->samplerate) { + packet.type = SR_DF_META; + packet.payload = &meta; + src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate)); + meta.config = g_slist_append(NULL, src); + sr_session_send(in->sdi, &packet); + sr_config_free(src); + } - if ((fd = open(filename, O_RDONLY)) == -1) - return SR_ERR; + inc->started = TRUE; + } - num_channels = g_slist_length(in->sdi->channels); + packet.type = SR_DF_LOGIC; + packet.payload = &logic; + logic.unitsize = (g_slist_length(in->sdi->channels) + 7) / 8; - /* Send header packet to the session bus. */ - std_session_send_df_header(in->sdi, LOG_PREFIX); + /* Cut off at multiple of unitsize. */ + chunk_size = in->buf->len / logic.unitsize * logic.unitsize; - if (ctx->samplerate) { - packet.type = SR_DF_META; - packet.payload = &meta; - src = sr_config_new(SR_CONF_SAMPLERATE, - g_variant_new_uint64(ctx->samplerate)); - meta.config = g_slist_append(NULL, src); + for (i = 0; i < chunk_size; i += chunk) { + logic.data = in->buf->str + i; + chunk = MIN(MAX_CHUNK_SIZE, chunk_size - i); + logic.length = chunk; sr_session_send(in->sdi, &packet); - sr_config_free(src); } + g_string_erase(in->buf, 0, chunk_size); - /* Chop up the input file into chunks & send it to the session bus. */ - packet.type = SR_DF_LOGIC; - packet.payload = &logic; - logic.unitsize = (num_channels + 7) / 8; - logic.data = buffer; - while ((size = read(fd, buffer, CHUNKSIZE)) > 0) { - logic.length = size; + return SR_OK; +} + +static int receive(struct sr_input *in, GString *buf) +{ + int ret; + + g_string_append_len(in->buf, buf->str, buf->len); + + if (!in->sdi_ready) { + /* sdi is ready, notify frontend. */ + in->sdi_ready = TRUE; + return SR_OK; + } + + ret = process_buffer(in); + + return ret; +} + +static int end(struct sr_input *in) +{ + struct context *inc; + struct sr_datafeed_packet packet; + int ret; + + if (in->sdi_ready) + ret = process_buffer(in); + else + ret = SR_OK; + + inc = in->priv; + if (inc->started) { + packet.type = SR_DF_END; sr_session_send(in->sdi, &packet); } - close(fd); - /* Send end packet to the session bus. */ - packet.type = SR_DF_END; - sr_session_send(in->sdi, &packet); + return ret; +} - g_free(ctx); - in->internal = NULL; +static struct sr_option options[] = { + { "numchannels", "Number of channels", "Number of channels", NULL, NULL }, + { "samplerate", "Sample rate", "Sample rate", NULL, NULL }, + ALL_ZERO +}; - return SR_OK; +static struct sr_option *get_options(void) +{ + if (!options[0].def) { + options[0].def = g_variant_ref_sink(g_variant_new_int32(DEFAULT_NUM_CHANNELS)); + options[1].def = g_variant_ref_sink(g_variant_new_uint64(DEFAULT_SAMPLERATE)); + } + + return options; } SR_PRIV struct sr_input_module input_binary = { .id = "binary", - .description = "Raw binary", - .format_match = format_match, + .name = "Binary", + .desc = "Raw binary", + .exts = NULL, + .options = get_options, .init = init, - .loadfile = loadfile, + .receive = receive, + .end = end, };