X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finput%2Fcsv.c;h=a8c689443a35430712b05a0099434d7c386e6031;hb=b75dc14a9410f57b3f7853854da013af86fb87c2;hp=ed2b49409b43d9b25c611ce47090c435d90cb5a2;hpb=c01378c95f34e60d3b67f84dc3a6c3c6c154186d;p=libsigrok.git diff --git a/src/input/csv.c b/src/input/csv.c index ed2b4940..a8c68944 100644 --- a/src/input/csv.c +++ b/src/input/csv.c @@ -738,7 +738,6 @@ static int receive(struct sr_input *in, GString *buf) static int end(struct sr_input *in) { struct context *inc; - struct sr_datafeed_packet packet; int ret; if (in->sdi_ready) @@ -747,11 +746,8 @@ static int end(struct sr_input *in) ret = SR_OK; inc = in->priv; - if (inc->started) { - /* End of stream. */ - packet.type = SR_DF_END; - sr_session_send(in->sdi, &packet); - } + if (inc->started) + std_session_send_df_end(in->sdi, LOG_PREFIX); return ret; } @@ -772,6 +768,17 @@ static void cleanup(struct sr_input *in) g_free(inc->sample_buffer); } +static int reset(struct sr_input *in) +{ + struct context *inc = in->priv; + + cleanup(in); + inc->started = FALSE; + g_string_truncate(in->buf, 0); + + return SR_OK; +} + static struct sr_option options[] = { { "single-column", "Single column", "Enable/specify single column", NULL, NULL }, { "numchannels", "Max channels", "Number of channels", NULL, NULL }, @@ -812,4 +819,5 @@ SR_PRIV struct sr_input_module input_csv = { .receive = receive, .end = end, .cleanup = cleanup, + .reset = reset, };