X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fbinary.c;h=da664a85e6f140d14de0c8796a6adc76e3034e8c;hb=97a000748a1a4ca7370121af0c84d0e2281d527a;hp=52e1da36e62c06d2a20202e27af957c22033381f;hpb=867293a1013eae2e9e14af23915facc676916214;p=libsigrok.git diff --git a/src/input/binary.c b/src/input/binary.c index 52e1da36..da664a85 100644 --- a/src/input/binary.c +++ b/src/input/binary.c @@ -29,13 +29,14 @@ #define LOG_PREFIX "input/binary" -#define MAX_CHUNK_SIZE 4096 +#define CHUNK_SIZE (4 * 1024 * 1024) #define DEFAULT_NUM_CHANNELS 8 #define DEFAULT_SAMPLERATE 0 struct context { gboolean started; uint64_t samplerate; + uint16_t unitsize; }; static int init(struct sr_input *in, GHashTable *options) @@ -60,6 +61,8 @@ static int init(struct sr_input *in, GHashTable *options) sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, name); } + inc->unitsize = (g_slist_length(in->sdi->channels) + 7) / 8; + return SR_OK; } @@ -92,14 +95,14 @@ static int process_buffer(struct sr_input *in) packet.type = SR_DF_LOGIC; packet.payload = &logic; - logic.unitsize = (g_slist_length(in->sdi->channels) + 7) / 8; + logic.unitsize = inc->unitsize; /* Cut off at multiple of unitsize. */ chunk_size = in->buf->len / logic.unitsize * logic.unitsize; for (i = 0; i < chunk_size; i += chunk) { logic.data = in->buf->str + i; - chunk = MIN(MAX_CHUNK_SIZE, chunk_size - i); + chunk = MIN(CHUNK_SIZE, chunk_size - i); logic.length = chunk; sr_session_send(in->sdi, &packet); } @@ -171,7 +174,7 @@ static const struct sr_option *get_options(void) SR_PRIV struct sr_input_module input_binary = { .id = "binary", .name = "Binary", - .desc = "Raw binary", + .desc = "Raw binary logic data", .exts = NULL, .options = get_options, .init = init,