X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fcsv.c;h=fdfc26419ae7e44e910549dafc4f8067cc985d40;hb=80430d4d202799a2a732e086a55ba1a058c4725b;hp=fc0e752cdcb94a73c4e69a8dc6ae9fa2d38b9e06;hpb=867293a1013eae2e9e14af23915facc676916214;p=libsigrok.git

diff --git a/src/input/csv.c b/src/input/csv.c
index fc0e752c..fdfc2641 100644
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -26,7 +26,7 @@
 
 #define LOG_PREFIX "input/csv"
 
-#define DATAFEED_MAX_SAMPLES	(128 * 1024)
+#define CHUNK_SIZE	(4 * 1024 * 1024)
 
 /*
  * The CSV input module has the following options:
@@ -624,7 +624,7 @@ static int initial_parse(const struct sr_input *in, GString *buf)
 	 * to a location within that large buffer.
 	 */
 	inc->sample_unit_size = (inc->num_channels + 7) / 8;
-	inc->datafeed_buf_size = DATAFEED_MAX_SAMPLES;
+	inc->datafeed_buf_size = CHUNK_SIZE;
 	inc->datafeed_buf_size *= inc->sample_unit_size;
 	inc->datafeed_buffer = g_malloc(inc->datafeed_buf_size);
 	inc->datafeed_buf_fill = 0;
@@ -925,11 +925,18 @@ static struct sr_option options[] = {
 
 static const struct sr_option *get_options(void)
 {
+	GSList *l;
+
 	if (!options[0].def) {
 		options[0].def = g_variant_ref_sink(g_variant_new_int32(0));
 		options[1].def = g_variant_ref_sink(g_variant_new_int32(0));
 		options[2].def = g_variant_ref_sink(g_variant_new_string(","));
 		options[3].def = g_variant_ref_sink(g_variant_new_string("bin"));
+		l = NULL;
+		l = g_slist_append(l, g_variant_ref_sink(g_variant_new_string("bin")));
+		l = g_slist_append(l, g_variant_ref_sink(g_variant_new_string("hex")));
+		l = g_slist_append(l, g_variant_ref_sink(g_variant_new_string("oct")));
+		options[3].values = l;
 		options[4].def = g_variant_ref_sink(g_variant_new_string(";"));
 		options[5].def = g_variant_ref_sink(g_variant_new_uint64(0));
 		options[6].def = g_variant_ref_sink(g_variant_new_int32(0));