X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fchronovu_la8.c;h=53e1477321510583c7529d60c8411ccc4c5b4b01;hb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;hp=f1eb921cbf021a3a468262c0075c579c070a6307;hpb=4f979115a4206bc1ff72c0319a340cbcad0f4b06;p=libsigrok.git diff --git a/src/input/chronovu_la8.c b/src/input/chronovu_la8.c index f1eb921c..53e14773 100644 --- a/src/input/chronovu_la8.c +++ b/src/input/chronovu_la8.c @@ -18,19 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #define LOG_PREFIX "input/chronovu-la8" #define DEFAULT_NUM_CHANNELS 8 -#define DEFAULT_SAMPLERATE "100MHz" -#define MAX_CHUNK_SIZE 4096 -#define CHRONOVU_LA8_FILESIZE 8 * 1024 * 1024 + 5 +#define DEFAULT_SAMPLERATE SR_MHZ(100) +#define MAX_CHUNK_SIZE (4 * 1024) +#define CHRONOVU_LA8_FILESIZE ((8 * 1024 * 1024) + 5) struct context { gboolean started; @@ -51,11 +52,8 @@ static int format_match(GHashTable *metadata) static int init(struct sr_input *in, GHashTable *options) { - struct sr_channel *ch; struct context *inc; - uint64_t samplerate; int num_channels, i; - const char *s; char name[16]; num_channels = g_variant_get_int32(g_hash_table_lookup(options, "numchannels")); @@ -64,26 +62,20 @@ static int init(struct sr_input *in, GHashTable *options) return SR_ERR_ARG; } - s = g_variant_get_string(g_hash_table_lookup(options, "samplerate"), NULL); - if (sr_parse_sizestring(s, &samplerate) != SR_OK) { - sr_err("Invalid samplerate '%s'.", s); - return SR_ERR_ARG; - } - - in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL); + in->sdi = g_malloc0(sizeof(struct sr_dev_inst)); in->priv = inc = g_malloc0(sizeof(struct context)); - inc->samplerate = samplerate; + + inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate")); for (i = 0; i < num_channels; i++) { 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); + sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, name); } return SR_OK; } -static int receive(const struct sr_input *in, GString *buf) +static int process_buffer(struct sr_input *in) { struct sr_datafeed_packet packet; struct sr_datafeed_meta meta; @@ -91,60 +83,77 @@ static int receive(const struct sr_input *in, GString *buf) struct sr_config *src; struct context *inc; gsize chunk_size, i; - int chunk, num_channels; + int chunk; inc = in->priv; - - g_string_append_len(in->buf, buf->str, buf->len); - - num_channels = g_slist_length(in->sdi->channels); - - std_session_send_df_header(in->sdi, LOG_PREFIX); - inc->started = TRUE; - - 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 (!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); + } + + inc->started = TRUE; + } packet.type = SR_DF_LOGIC; packet.payload = &logic; - logic.unitsize = (num_channels + 7) / 8; - logic.data = in->buf->str; + logic.unitsize = (g_slist_length(in->sdi->channels) + 7) / 8; /* Cut off at multiple of unitsize. */ chunk_size = in->buf->len / logic.unitsize * logic.unitsize; - chunk = 0; for (i = 0; i < chunk_size; i += chunk) { - chunk = MAX(MAX_CHUNK_SIZE, chunk_size - i); + logic.data = in->buf->str + i; + chunk = MIN(MAX_CHUNK_SIZE, chunk_size - i); logic.length = chunk; sr_session_send(in->sdi, &packet); } - - if (in->buf->len > chunk_size) - g_string_erase(in->buf, 0, in->buf->len - chunk_size); + g_string_erase(in->buf, 0, chunk_size); return SR_OK; } -static int cleanup(struct sr_input *in) +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 sr_datafeed_packet packet; struct context *inc; + struct sr_datafeed_packet packet; + int ret; - inc = in->priv; + 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); } - g_free(in->priv); - in->priv = NULL; - return SR_OK; + return ret; } static struct sr_option options[] = { @@ -157,7 +166,7 @@ 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_string(DEFAULT_SAMPLERATE)); + options[1].def = g_variant_ref_sink(g_variant_new_uint64(DEFAULT_SAMPLERATE)); } return options; @@ -167,10 +176,11 @@ SR_PRIV struct sr_input_module input_chronovu_la8 = { .id = "chronovu-la8", .name = "Chronovu-LA8", .desc = "ChronoVu LA8", + .exts = (const char*[]){"kdt", NULL}, .metadata = { SR_INPUT_META_FILESIZE | SR_INPUT_META_REQUIRED }, .options = get_options, .format_match = format_match, .init = init, .receive = receive, - .cleanup = cleanup, + .end = end, };