X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fbinary.c;h=d7080b0b22bf6c83df05abd26d471c272024c99b;hb=HEAD;hp=52e1da36e62c06d2a20202e27af957c22033381f;hpb=867293a1013eae2e9e14af23915facc676916214;p=libsigrok.git

diff --git a/src/input/binary.c b/src/input/binary.c
index 52e1da36..631d6d38 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,15 +61,15 @@ 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;
 }
 
 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;
@@ -78,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;
@@ -92,14 +88,16 @@ 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);
+		chunk /= logic.unitsize;
+		chunk *= logic.unitsize;
 		logic.length = chunk;
 		sr_session_send(in->sdi, &packet);
 	}
@@ -171,7 +169,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,