serial: Make serial device event sources more robust

[libsigrok.git] / src / output / csv.c

diff --git a/src/output/csv.c b/src/output/csv.c
index 36cf2e86931b6cb7cd1552eb42716f4191dec6e3..8b234424c22211a0976552a131fbb5c549a7d0e6 100644 (file)
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h" /* Needed for PACKAGE_STRING and others. */
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
@@ -118,8 +117,8 @@ static GString *gen_header(const struct sr_output *o)
 
        /* Some metadata */
        t = time(NULL);
-       g_string_append_printf(header, "; CSV, generated by %s on %s",
-                       PACKAGE_STRING, ctime(&t));
+       g_string_append_printf(header, "; CSV, generated by %s %s on %s",
+                       PACKAGE_NAME, SR_PACKAGE_VERSION_STRING, ctime(&t));
 
        /* Columns / channels */
        num_channels = g_slist_length(o->sdi->channels);
@@ -224,7 +223,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                 */
                memset(ctx->analog_vals, 0, sizeof(float) * ctx->num_analog_channels);
                ctx->inframe = TRUE;
-               ret = SR_OK_CONTINUE;
+               ret = SR_OK;
                break;
        case SR_DF_FRAME_END:
                /*
@@ -270,7 +269,6 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 
                if (ctx->inframe) {
                        handle_analog_frame(ctx, analog);
-                       ret = SR_OK_CONTINUE;
                        break;
                }