X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fbinary.c;h=631d6d38c10d85d8fa620d354da60305873e9392;hb=7601dca780c21facad042dd716d76fe7923d7eab;hp=da664a85e6f140d14de0c8796a6adc76e3034e8c;hpb=b20eb52055042a1a1dd61d928a3f3a4b706c7d01;p=libsigrok.git diff --git a/src/input/binary.c b/src/input/binary.c index da664a85..631d6d38 100644 --- a/src/input/binary.c +++ b/src/input/binary.c @@ -69,9 +69,7 @@ static int init(struct sr_input *in, GHashTable *options) 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; struct context *inc; gsize chunk_size, i; int chunk; @@ -81,13 +79,8 @@ static int process_buffer(struct sr_input *in) std_session_send_df_header(in->sdi); 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); - g_slist_free(meta.config); - sr_config_free(src); + (void)sr_session_send_meta(in->sdi, SR_CONF_SAMPLERATE, + g_variant_new_uint64(inc->samplerate)); } inc->started = TRUE; @@ -103,6 +96,8 @@ static int process_buffer(struct sr_input *in) for (i = 0; i < chunk_size; i += chunk) { logic.data = in->buf->str + i; chunk = MIN(CHUNK_SIZE, chunk_size - i); + chunk /= logic.unitsize; + chunk *= logic.unitsize; logic.length = chunk; sr_session_send(in->sdi, &packet); }