X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fraw_analog.c;h=811c01e8501a82f19f0fd49098255c4406eedd6d;hb=2a801861030f78066b8031c71833184f5c0c2e76;hp=ca29eaa431628f6fc06e304188e0faa177fe3677;hpb=867293a1013eae2e9e14af23915facc676916214;p=libsigrok.git diff --git a/src/input/raw_analog.c b/src/input/raw_analog.c index ca29eaa4..811c01e8 100644 --- a/src/input/raw_analog.c +++ b/src/input/raw_analog.c @@ -31,7 +31,7 @@ #define LOG_PREFIX "input/raw_analog" /* How many bytes at a time to process and send to the session bus. */ -#define CHUNK_SIZE 4096 +#define CHUNK_SIZE (4 * 1024 * 1024) #define DEFAULT_NUM_CHANNELS 1 #define DEFAULT_SAMPLERATE 0 @@ -256,15 +256,13 @@ static const struct sr_option *get_options(void) static void cleanup(struct sr_input *in) { - struct context *inc; + g_free(in->priv); + in->priv = NULL; - inc = in->priv; g_variant_unref(options[0].def); g_variant_unref(options[1].def); g_variant_unref(options[2].def); g_slist_free_full(options[2].values, (GDestroyNotify)g_variant_unref); - g_free(inc); - in->priv = NULL; } static int reset(struct sr_input *in) @@ -272,7 +270,7 @@ static int reset(struct sr_input *in) struct context *inc = in->priv; inc->started = FALSE; - cleanup(in); + g_string_truncate(in->buf, 0); return SR_OK; @@ -281,7 +279,7 @@ static int reset(struct sr_input *in) SR_PRIV struct sr_input_module input_raw_analog = { .id = "raw_analog", .name = "RAW analog", - .desc = "Raw analog signals without header", + .desc = "Raw analog data without header", .exts = (const char*[]){"raw", "bin", NULL}, .options = get_options, .init = init,